diff --git a/Plugin/CTFWhitelist.m b/Plugin/CTFWhitelist.m
index b8f23828..14e3c3db 100644
--- a/Plugin/CTFWhitelist.m
+++ b/Plugin/CTFWhitelist.m
@@ -37,7 +37,7 @@ of this software and associated documentation files (the "Software"), to deal
 static NSString *sCTFWhitelistAdditionMade = @"CTFWhitelistAdditionMade";
 
     // CTFUserDefaultsController keys
-static NSString *sHostSiteInfoDefaultsKey = @"ClickToFlash_siteInfo";
+static NSString *sHostSiteInfoDefaultsKey = @"siteInfo";
 
 typedef enum {
     CTFSiteKindWhitelist = 0
diff --git a/Plugin/English.lproj/WhitelistPanel.xib b/Plugin/English.lproj/WhitelistPanel.xib
index 5129ea2f..310fa282 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="42"/>
+			<integer value="9"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -824,9 +824,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 				<bool key="NSFilterRestrictsInsertion">YES</bool>
 				<bool key="NSClearsFilterPredicateOnInsertion">YES</bool>
 			</object>
-			<object class="NSUserDefaultsController" id="913882380">
-				<bool key="NSSharedInstance">YES</bool>
-			</object>
 			<object class="NSUserDefaultsController" id="961452516">
 				<object class="NSMutableArray" key="NSDeclaredKeys">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1822,11 +1819,6 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4</string>
 						<reference key="object" ref="358695226"/>
 						<reference key="parent" ref="710573940"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">7</int>
-						<reference key="object" ref="913882380"/>
-						<reference key="parent" ref="1002"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">170</int>
 						<reference key="object" ref="961452516"/>
@@ -2258,8 +2250,6 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4</string>
 					<string>4.IBPluginDependency</string>
 					<string>41.IBPluginDependency</string>
 					<string>42.IBPluginDependency</string>
-					<string>7.CustomClassName</string>
-					<string>7.IBPluginDependency</string>
 					<string>9.IBPluginDependency</string>
 				</object>
 				<object class="NSMutableArray" key="dict.values">
@@ -2267,9 +2257,9 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilderKit</string>
 					<string>com.apple.InterfaceBuilderKit</string>
-					<string>{{186, 118}, {527, 516}}</string>
+					<string>{{323, 126}, {527, 516}}</string>
 					<reference ref="5"/>
-					<string>{{186, 118}, {527, 516}}</string>
+					<string>{{323, 126}, {527, 516}}</string>
 					<integer value="1" id="9"/>
 					<string>{196, 240}</string>
 					<string>{{202, 428}, {480, 270}}</string>
@@ -2448,8 +2438,6 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>CTFUserDefaultsController</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 				</object>
 			</object>
@@ -2473,7 +2461,7 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4</string>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">251</int>
+			<int key="maxID">252</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/Plugin/Plugin.m b/Plugin/Plugin.m
index 4b30c3c5..565a0887 100755
--- a/Plugin/Plugin.m
+++ b/Plugin/Plugin.m
@@ -120,7 +120,6 @@ - (id) initWithArguments:(NSDictionary *)arguments
 														@"com.Zattoo.prefs",
 							nil];
 		
-		[[NSUserDefaults standardUserDefaults] addSuiteNamed:@"com.github.rentzsch.clicktoflash"];
 		SparkleManager *sharedSparkleManager = [SparkleManager sharedManager];
 		NSWorkspace *sharedWorkspace = [NSWorkspace sharedWorkspace];
 		NSString *pathToRelaunch = [sharedWorkspace absolutePathForAppBundleWithIdentifier:[self launchedAppBundleIdentifier]];