diff --git a/Sources/App/Classes/IRC/IRCClient.m b/Sources/App/Classes/IRC/IRCClient.m
index ef7f37a74..60fc4f7e3 100644
--- a/Sources/App/Classes/IRC/IRCClient.m
+++ b/Sources/App/Classes/IRC/IRCClient.m
@@ -3394,12 +3394,12 @@ NSString * const IRCClientUserNicknameChangedNotification = @"IRCClientUserNickn
 			}
 
 			/* Prepare to toggle feature */
-			NSString *feature = stringIn.tokenIncludingQuotes.string;
+			NSString *feature = stringIn.tokenInsideQuotes.string;
 
 			BOOL applyToAll = [feature isEqualToString:@"-a"];
 
 			if (applyToAll) {
-				feature = stringIn.tokenIncludingQuotes.string;
+				feature = stringIn.tokenInsideQuotes.string;
 			}
 
 			NSDictionary *features = @{
@@ -12348,7 +12348,7 @@ NSString * const IRCClientUserNicknameChangedNotification = @"IRCClientUserNickn
 		return;
 	}
 
-	NSString *section1 = textMutable.tokenIncludingQuotes;
+	NSString *section1 = textMutable.tokenInsideQuotes;
 	NSString *section2 = textMutable.token;
 	NSString *section3 = textMutable.token;
 	NSString *section4 = textMutable.token;
diff --git a/Sources/App/Classes/Preferences/TPCResourceManager.m b/Sources/App/Classes/Preferences/TPCResourceManager.m
index 66578e2f0..ab33fa902 100644
--- a/Sources/App/Classes/Preferences/TPCResourceManager.m
+++ b/Sources/App/Classes/Preferences/TPCResourceManager.m
@@ -425,8 +425,8 @@ NSString * const TPCResourceManagerScriptDocumentTypeExtensionWithoutPeriod		= @
 {
 	return [RZFileManager() replaceItemAtURL:destination
 							   withItemAtURL:url
-						   moveToDestination:NO
-					  moveDestinationToTrash:YES];
+									 options:(CSFileManagerOptionsMoveToTrash |
+											  CSFileManagerOptionsRemoveIfExists)];
 }
 
 @end
diff --git a/Sources/App/Classes/Preferences/Themes/TPCThemeController.m b/Sources/App/Classes/Preferences/Themes/TPCThemeController.m
index b48c8ab1f..e78c4919a 100644
--- a/Sources/App/Classes/Preferences/Themes/TPCThemeController.m
+++ b/Sources/App/Classes/Preferences/Themes/TPCThemeController.m
@@ -844,8 +844,7 @@ typedef NSMutableDictionary	<NSString *, TPCTheme *> 	*TPCThemeControllerThemeLi
 
 	[RZFileManager() replaceItemAtURL:temporaryURL
 						withItemAtURL:originalURL
-					moveToDestination:NO
-			   moveDestinationToTrash:NO];
+							  options:CSFileManagerOptionsRemoveIfExists];
 }
 
 - (void)presentCompatibilityAlert
@@ -1231,8 +1230,8 @@ typedef NSMutableDictionary	<NSString *, TPCTheme *> 	*TPCThemeControllerThemeLi
 
 	if ([RZFileManager() replaceItemAtURL:destinationURL
 							withItemAtURL:sourceURL
-						moveToDestination:NO
-				   moveDestinationToTrash:YES] == NO)
+								  options:(CSFileManagerOptionsMoveToTrash |
+										   CSFileManagerOptionsRemoveIfExists)] == NO)
 	{
 		[self cancelOperation];