diff --git a/Plugin/CTFUserDefaultsController.m b/Plugin/CTFUserDefaultsController.m
old mode 100755
new mode 100644
index 672e46d8..bb10c090
--- a/Plugin/CTFUserDefaultsController.m
+++ b/Plugin/CTFUserDefaultsController.m
@@ -38,6 +38,17 @@ - (id)init;
 	return self;
 }
 
+- (id)initWithCoder:(NSCoder *)decoder;
+{
+	if (! sharedInstance) {
+		if ((self = [super init])) {
+			hasInited = YES;
+		}
+	}
+	
+	return self;
+}
+
 - (void)dealloc;
 {
 	[userDefaultsDict release];
@@ -50,9 +61,11 @@ - (void)setUpExternalPrefsDictionary;
 											 selector:@selector(pluginDefaultsDidChange:)
 												 name:@"ClickToFlashPluginDefaultsDidChange"
 											   object:nil];
+	[[NSUserDefaults standardUserDefaults] addSuiteNamed:@"com.github.rentzsch.clicktoflash"];
 	[self setValues:[CTFPreferencesDictionary dictionaryWithDictionary:
 					 [[NSUserDefaults standardUserDefaults] persistentDomainForName:@"com.github.rentzsch.clicktoflash"]]
 	 ];	
+	[[NSUserDefaults standardUserDefaults] removeSuiteNamed:@"com.github.rentzsch.clicktoflash"];
 }
 
 - (CTFPreferencesDictionary *)values;
@@ -78,9 +91,11 @@ - (CTFPreferencesDictionary *)dictionaryRepresentation;
 
 - (void)setValues:(CTFPreferencesDictionary *)newUserDefaultsDict;
 {
+	CTFPreferencesDictionary *newDictCopy = [newUserDefaultsDict copy];
 	if (! userDefaultsDict) userDefaultsDict = [[CTFPreferencesDictionary alloc] init]; 
 	[userDefaultsDict removeAllObjects];
-	[userDefaultsDict addEntriesFromDictionary:newUserDefaultsDict];
+	[userDefaultsDict addEntriesFromDictionary:newDictCopy];
+	[newDictCopy release];
 }
 
 - (void)pluginDefaultsDidChange:(NSNotification *)notification;
diff --git a/Plugin/CTFWhitelist.m b/Plugin/CTFWhitelist.m
index 14e3c3db..34ee3fa7 100644
--- a/Plugin/CTFWhitelist.m
+++ b/Plugin/CTFWhitelist.m
@@ -180,7 +180,11 @@ - (void) _addHostToWhitelist
 {
     NSMutableArray *siteInfo = [self _mutableSiteInfo];
     [siteInfo addObject: whitelistItemForSite([self host])];
-    [[CTFUserDefaultsController standardUserDefaults] setObject: siteInfo forKey: sHostSiteInfoDefaultsKey];
+	
+	[[CTFUserDefaultsController standardUserDefaults] setValue:siteInfo forKeyPath:@"values.siteInfo"];
+    //[values setObject:siteInfo forKey:sHostSiteInfoDefaultsKey];
+	//[[CTFUserDefaultsController standardUserDefaults] setValues:values];
+	
     [[NSNotificationCenter defaultCenter] postNotificationName: sCTFWhitelistAdditionMade object: self];
 }
 
diff --git a/Plugin/English.lproj/WhitelistPanel.xib b/Plugin/English.lproj/WhitelistPanel.xib
index 310fa282..3990afe3 100755
--- a/Plugin/English.lproj/WhitelistPanel.xib
+++ b/Plugin/English.lproj/WhitelistPanel.xib
@@ -8,7 +8,7 @@
 		<string key="IBDocument.HIToolboxVersion">353.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="9"/>
+			<integer value="12"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1245,35 +1245,6 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4</string>
 					</object>
 					<int key="connectionID">115</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: arrangedObjects.site</string>
-						<reference key="source" ref="360546441"/>
-						<reference key="destination" ref="258102979"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="360546441"/>
-							<reference key="NSDestination" ref="258102979"/>
-							<string key="NSLabel">value: arrangedObjects.site</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">arrangedObjects.site</string>
-							<object class="NSDictionary" key="NSOptions">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMutableArray" key="dict.sortedKeys">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>NSAllowsEditingMultipleValuesSelection</string>
-									<string>NSNullPlaceholder</string>
-								</object>
-								<object class="NSMutableArray" key="dict.values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<reference ref="8"/>
-									<string>double-click to set</string>
-								</object>
-							</object>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">130</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">checkForUpdates:</string>
@@ -1490,6 +1461,35 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4</string>
 					</object>
 					<int key="connectionID">251</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: arrangedObjects.site</string>
+						<reference key="source" ref="360546441"/>
+						<reference key="destination" ref="258102979"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="360546441"/>
+							<reference key="NSDestination" ref="258102979"/>
+							<string key="NSLabel">value: arrangedObjects.site</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">arrangedObjects.site</string>
+							<object class="NSDictionary" key="NSOptions">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSMutableArray" key="dict.sortedKeys">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<string>NSAllowsEditingMultipleValuesSelection</string>
+									<string>NSNullPlaceholder</string>
+								</object>
+								<object class="NSMutableArray" key="dict.values">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<reference ref="6"/>
+									<string>double-click to set</string>
+								</object>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">256</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -2461,7 +2461,7 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4</string>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">252</int>
+			<int key="maxID">256</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/Plugin/Plugin.m b/Plugin/Plugin.m
index 565a0887..c5e9ec6d 100755
--- a/Plugin/Plugin.m
+++ b/Plugin/Plugin.m
@@ -417,6 +417,7 @@ - (void) _migratePrefsToExternalFile
 	
 	NSMutableDictionary *externalFileDefaults = [[CTFUserDefaultsController standardUserDefaults] dictionaryRepresentation];
 
+	[[NSUserDefaults standardUserDefaults] addSuiteNamed:@"com.github.rentzsch.clicktoflash"];
 	unsigned int i;
 	for (i = 0; i < [parasiticDefaultsNameArray count]; i++) {
 		NSString *currentParasiticDefault = [parasiticDefaultsNameArray objectAtIndex:i];
@@ -440,6 +441,7 @@ - (void) _migratePrefsToExternalFile
 			[[NSUserDefaults standardUserDefaults] removeObjectForKey:currentParasiticDefault];
 		}
 	}
+	[[NSUserDefaults standardUserDefaults] removeSuiteNamed:@"com.github.rentzsch.clicktoflash"];
 }
 
 - (void) _addApplicationWhitelistArrayToPrefsFile