diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 9950777..7c37989 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -2,18 +2,24 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10F569</string>
-		<string key="IBDocument.InterfaceBuilderVersion">823</string>
-		<string key="IBDocument.AppKitVersion">1038.29</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
+		<string key="IBDocument.SystemVersion">11E52</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
+		<string key="IBDocument.AppKitVersion">1138.47</string>
+		<string key="IBDocument.HIToolboxVersion">569.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">823</string>
+			<string key="NS.object.0">2182</string>
 		</object>
-		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="372"/>
-			<integer value="57"/>
+			<string>NSView</string>
+			<string>NSMenu</string>
+			<string>NSWindowTemplate</string>
+			<string>NSMenuItem</string>
+			<string>NSTextField</string>
+			<string>NSTextFieldCell</string>
+			<string>NSCustomView</string>
+			<string>NSCustomObject</string>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1117,7 +1123,7 @@
 				<string key="NSWindowTitle">Window</string>
 				<string key="NSWindowClass">NSWindow</string>
 				<nil key="NSViewClass"/>
-				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+				<nil key="NSUserInterfaceItemIdentifier"/>
 				<object class="NSView" key="NSWindowView" id="439893737">
 					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
@@ -1128,6 +1134,8 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{129, 99}, {93, 28}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="937806155"/>
 							<string key="NSClassName">TMSliderControl</string>
 						</object>
 						<object class="NSCustomView" id="788561259">
@@ -1135,6 +1143,7 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{145, 54}, {55, 18}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
 							<string key="NSClassName">TMSliderControlSmall</string>
 						</object>
 						<object class="NSTextField" id="1066635749">
@@ -1142,6 +1151,8 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{78, 103}, {38, 22}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="701204909"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="71057210">
 								<int key="NSCellFlags">67239424</int>
@@ -1159,7 +1170,7 @@
 									<string key="NSColorName">controlColor</string>
 									<object class="NSColor" key="NSColor">
 										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
+										<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
 									</object>
 								</object>
 								<object class="NSColor" key="NSTextColor" id="49318390">
@@ -1178,6 +1189,8 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{233, 103}, {34, 22}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="788561259"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="535404401">
 								<int key="NSCellFlags">67239424</int>
@@ -1192,9 +1205,12 @@
 					</object>
 					<string key="NSFrameSize">{345, 177}</string>
 					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView" ref="1066635749"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
-				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
 			<object class="NSCustomObject" id="755631768">
 				<string key="NSClassName">NSFontManager</string>
@@ -1206,6 +1222,22 @@
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<object class="NSMutableArray" key="connectionRecords">
 				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">terminate:</string>
+						<reference key="source" ref="1050"/>
+						<reference key="destination" ref="632727374"/>
+					</object>
+					<int key="connectionID">449</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">orderFrontStandardAboutPanel:</string>
+						<reference key="source" ref="1021"/>
+						<reference key="destination" ref="238522557"/>
+					</object>
+					<int key="connectionID">142</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">performMiniaturize:</string>
@@ -1246,14 +1278,6 @@
 					</object>
 					<int key="connectionID">127</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">orderFrontStandardAboutPanel:</string>
-						<reference key="source" ref="1021"/>
-						<reference key="destination" ref="238522557"/>
-					</object>
-					<int key="connectionID">142</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">performClose:</string>
@@ -1502,46 +1526,6 @@
 					</object>
 					<int key="connectionID">374</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">addFontTrait:</string>
-						<reference key="source" ref="755631768"/>
-						<reference key="destination" ref="305399458"/>
-					</object>
-					<int key="connectionID">421</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">addFontTrait:</string>
-						<reference key="source" ref="755631768"/>
-						<reference key="destination" ref="814362025"/>
-					</object>
-					<int key="connectionID">422</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">modifyFont:</string>
-						<reference key="source" ref="755631768"/>
-						<reference key="destination" ref="885547335"/>
-					</object>
-					<int key="connectionID">423</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">orderFrontFontPanel:</string>
-						<reference key="source" ref="755631768"/>
-						<reference key="destination" ref="159677712"/>
-					</object>
-					<int key="connectionID">424</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">modifyFont:</string>
-						<reference key="source" ref="755631768"/>
-						<reference key="destination" ref="158063935"/>
-					</object>
-					<int key="connectionID">425</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">raiseBaseline:</string>
@@ -1728,43 +1712,43 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">terminate:</string>
-						<reference key="source" ref="1050"/>
-						<reference key="destination" ref="632727374"/>
+						<string key="label">addFontTrait:</string>
+						<reference key="source" ref="755631768"/>
+						<reference key="destination" ref="305399458"/>
 					</object>
-					<int key="connectionID">449</int>
+					<int key="connectionID">421</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">textColor: onColor</string>
-						<reference key="source" ref="937806155"/>
-						<reference key="destination" ref="583138362"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="937806155"/>
-							<reference key="NSDestination" ref="583138362"/>
-							<string key="NSLabel">textColor: onColor</string>
-							<string key="NSBinding">textColor</string>
-							<string key="NSKeyPath">onColor</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
+					<object class="IBActionConnection" key="connection">
+						<string key="label">addFontTrait:</string>
+						<reference key="source" ref="755631768"/>
+						<reference key="destination" ref="814362025"/>
 					</object>
-					<int key="connectionID">461</int>
+					<int key="connectionID">422</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">textColor: offColor</string>
-						<reference key="source" ref="1066635749"/>
-						<reference key="destination" ref="583138362"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="1066635749"/>
-							<reference key="NSDestination" ref="583138362"/>
-							<string key="NSLabel">textColor: offColor</string>
-							<string key="NSBinding">textColor</string>
-							<string key="NSKeyPath">offColor</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
+					<object class="IBActionConnection" key="connection">
+						<string key="label">modifyFont:</string>
+						<reference key="source" ref="755631768"/>
+						<reference key="destination" ref="885547335"/>
 					</object>
-					<int key="connectionID">462</int>
+					<int key="connectionID">423</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">orderFrontFontPanel:</string>
+						<reference key="source" ref="755631768"/>
+						<reference key="destination" ref="159677712"/>
+					</object>
+					<int key="connectionID">424</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">modifyFont:</string>
+						<reference key="source" ref="755631768"/>
+						<reference key="destination" ref="158063935"/>
+					</object>
+					<int key="connectionID">425</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
@@ -1776,19 +1760,51 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">sliderChanged:</string>
+						<string key="label">smallSliderChanged:</string>
 						<reference key="source" ref="583138362"/>
-						<reference key="destination" ref="701204909"/>
+						<reference key="destination" ref="788561259"/>
 					</object>
-					<int key="connectionID">464</int>
+					<int key="connectionID">467</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">smallSliderChanged:</string>
+						<string key="label">sliderChanged:</string>
 						<reference key="source" ref="583138362"/>
-						<reference key="destination" ref="788561259"/>
+						<reference key="destination" ref="701204909"/>
 					</object>
-					<int key="connectionID">467</int>
+					<int key="connectionID">468</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">textColor: offColor</string>
+						<reference key="source" ref="1066635749"/>
+						<reference key="destination" ref="583138362"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="1066635749"/>
+							<reference key="NSDestination" ref="583138362"/>
+							<string key="NSLabel">textColor: offColor</string>
+							<string key="NSBinding">textColor</string>
+							<string key="NSKeyPath">offColor</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">462</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">textColor: onColor</string>
+						<reference key="source" ref="937806155"/>
+						<reference key="destination" ref="583138362"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="937806155"/>
+							<reference key="NSDestination" ref="583138362"/>
+							<string key="NSLabel">textColor: onColor</string>
+							<string key="NSBinding">textColor</string>
+							<string key="NSKeyPath">onColor</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">461</int>
 				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -2742,145 +2758,74 @@
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<object class="NSArray" key="dict.sortedKeys">
 					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>-1.IBPluginDependency</string>
+					<string>-2.IBPluginDependency</string>
 					<string>-3.IBPluginDependency</string>
 					<string>103.IBPluginDependency</string>
-					<string>103.ImportedFromIB2</string>
 					<string>106.IBPluginDependency</string>
-					<string>106.ImportedFromIB2</string>
-					<string>106.editorWindowContentRectSynchronizationRect</string>
 					<string>111.IBPluginDependency</string>
-					<string>111.ImportedFromIB2</string>
 					<string>112.IBPluginDependency</string>
-					<string>112.ImportedFromIB2</string>
 					<string>124.IBPluginDependency</string>
-					<string>124.ImportedFromIB2</string>
 					<string>125.IBPluginDependency</string>
-					<string>125.ImportedFromIB2</string>
-					<string>125.editorWindowContentRectSynchronizationRect</string>
 					<string>126.IBPluginDependency</string>
-					<string>126.ImportedFromIB2</string>
 					<string>129.IBPluginDependency</string>
-					<string>129.ImportedFromIB2</string>
 					<string>130.IBPluginDependency</string>
-					<string>130.ImportedFromIB2</string>
-					<string>130.editorWindowContentRectSynchronizationRect</string>
 					<string>131.IBPluginDependency</string>
-					<string>131.ImportedFromIB2</string>
 					<string>134.IBPluginDependency</string>
-					<string>134.ImportedFromIB2</string>
 					<string>136.IBPluginDependency</string>
-					<string>136.ImportedFromIB2</string>
 					<string>143.IBPluginDependency</string>
-					<string>143.ImportedFromIB2</string>
 					<string>144.IBPluginDependency</string>
-					<string>144.ImportedFromIB2</string>
 					<string>145.IBPluginDependency</string>
-					<string>145.ImportedFromIB2</string>
 					<string>149.IBPluginDependency</string>
-					<string>149.ImportedFromIB2</string>
 					<string>150.IBPluginDependency</string>
-					<string>150.ImportedFromIB2</string>
 					<string>19.IBPluginDependency</string>
-					<string>19.ImportedFromIB2</string>
 					<string>195.IBPluginDependency</string>
-					<string>195.ImportedFromIB2</string>
 					<string>196.IBPluginDependency</string>
-					<string>196.ImportedFromIB2</string>
 					<string>197.IBPluginDependency</string>
-					<string>197.ImportedFromIB2</string>
 					<string>198.IBPluginDependency</string>
-					<string>198.ImportedFromIB2</string>
 					<string>199.IBPluginDependency</string>
-					<string>199.ImportedFromIB2</string>
 					<string>200.IBPluginDependency</string>
-					<string>200.ImportedFromIB2</string>
-					<string>200.editorWindowContentRectSynchronizationRect</string>
 					<string>201.IBPluginDependency</string>
-					<string>201.ImportedFromIB2</string>
 					<string>202.IBPluginDependency</string>
-					<string>202.ImportedFromIB2</string>
 					<string>203.IBPluginDependency</string>
-					<string>203.ImportedFromIB2</string>
 					<string>204.IBPluginDependency</string>
-					<string>204.ImportedFromIB2</string>
 					<string>205.IBPluginDependency</string>
-					<string>205.ImportedFromIB2</string>
-					<string>205.editorWindowContentRectSynchronizationRect</string>
 					<string>206.IBPluginDependency</string>
-					<string>206.ImportedFromIB2</string>
 					<string>207.IBPluginDependency</string>
-					<string>207.ImportedFromIB2</string>
 					<string>208.IBPluginDependency</string>
-					<string>208.ImportedFromIB2</string>
 					<string>209.IBPluginDependency</string>
-					<string>209.ImportedFromIB2</string>
 					<string>210.IBPluginDependency</string>
-					<string>210.ImportedFromIB2</string>
 					<string>211.IBPluginDependency</string>
-					<string>211.ImportedFromIB2</string>
 					<string>212.IBPluginDependency</string>
-					<string>212.ImportedFromIB2</string>
-					<string>212.editorWindowContentRectSynchronizationRect</string>
 					<string>213.IBPluginDependency</string>
-					<string>213.ImportedFromIB2</string>
 					<string>214.IBPluginDependency</string>
-					<string>214.ImportedFromIB2</string>
 					<string>215.IBPluginDependency</string>
-					<string>215.ImportedFromIB2</string>
 					<string>216.IBPluginDependency</string>
-					<string>216.ImportedFromIB2</string>
 					<string>217.IBPluginDependency</string>
-					<string>217.ImportedFromIB2</string>
 					<string>218.IBPluginDependency</string>
-					<string>218.ImportedFromIB2</string>
 					<string>219.IBPluginDependency</string>
-					<string>219.ImportedFromIB2</string>
 					<string>220.IBPluginDependency</string>
-					<string>220.ImportedFromIB2</string>
-					<string>220.editorWindowContentRectSynchronizationRect</string>
 					<string>221.IBPluginDependency</string>
-					<string>221.ImportedFromIB2</string>
 					<string>23.IBPluginDependency</string>
-					<string>23.ImportedFromIB2</string>
 					<string>236.IBPluginDependency</string>
-					<string>236.ImportedFromIB2</string>
 					<string>239.IBPluginDependency</string>
-					<string>239.ImportedFromIB2</string>
 					<string>24.IBPluginDependency</string>
-					<string>24.ImportedFromIB2</string>
-					<string>24.editorWindowContentRectSynchronizationRect</string>
-					<string>29.IBEditorWindowLastContentRect</string>
 					<string>29.IBPluginDependency</string>
-					<string>29.ImportedFromIB2</string>
-					<string>29.WindowOrigin</string>
-					<string>29.editorWindowContentRectSynchronizationRect</string>
 					<string>295.IBPluginDependency</string>
 					<string>296.IBPluginDependency</string>
-					<string>296.editorWindowContentRectSynchronizationRect</string>
 					<string>297.IBPluginDependency</string>
 					<string>298.IBPluginDependency</string>
 					<string>346.IBPluginDependency</string>
-					<string>346.ImportedFromIB2</string>
 					<string>348.IBPluginDependency</string>
-					<string>348.ImportedFromIB2</string>
 					<string>349.IBPluginDependency</string>
-					<string>349.ImportedFromIB2</string>
-					<string>349.editorWindowContentRectSynchronizationRect</string>
 					<string>350.IBPluginDependency</string>
-					<string>350.ImportedFromIB2</string>
 					<string>351.IBPluginDependency</string>
-					<string>351.ImportedFromIB2</string>
 					<string>354.IBPluginDependency</string>
-					<string>354.ImportedFromIB2</string>
-					<string>371.IBEditorWindowLastContentRect</string>
 					<string>371.IBPluginDependency</string>
 					<string>371.IBWindowTemplateEditedContentRect</string>
 					<string>371.NSWindowTemplate.visibleAtLaunch</string>
-					<string>371.editorWindowContentRectSynchronizationRect</string>
-					<string>371.windowTemplate.maxSize</string>
 					<string>372.IBPluginDependency</string>
 					<string>375.IBPluginDependency</string>
-					<string>376.IBEditorWindowLastContentRect</string>
 					<string>376.IBPluginDependency</string>
 					<string>377.IBPluginDependency</string>
 					<string>378.IBPluginDependency</string>
@@ -2893,7 +2838,6 @@
 					<string>385.IBPluginDependency</string>
 					<string>386.IBPluginDependency</string>
 					<string>387.IBPluginDependency</string>
-					<string>388.IBEditorWindowLastContentRect</string>
 					<string>388.IBPluginDependency</string>
 					<string>389.IBPluginDependency</string>
 					<string>390.IBPluginDependency</string>
@@ -2926,190 +2870,101 @@
 					<string>417.IBPluginDependency</string>
 					<string>418.IBPluginDependency</string>
 					<string>419.IBPluginDependency</string>
+					<string>420.IBPluginDependency</string>
+					<string>450.IBPluginDependency</string>
 					<string>451.IBPluginDependency</string>
-					<string>451.IBViewBoundsToFrameTransform</string>
 					<string>452.IBPluginDependency</string>
 					<string>453.IBPluginDependency</string>
 					<string>454.IBPluginDependency</string>
 					<string>455.IBPluginDependency</string>
 					<string>465.IBPluginDependency</string>
 					<string>5.IBPluginDependency</string>
-					<string>5.ImportedFromIB2</string>
 					<string>56.IBPluginDependency</string>
-					<string>56.ImportedFromIB2</string>
-					<string>57.IBEditorWindowLastContentRect</string>
 					<string>57.IBPluginDependency</string>
-					<string>57.ImportedFromIB2</string>
-					<string>57.editorWindowContentRectSynchronizationRect</string>
 					<string>58.IBPluginDependency</string>
-					<string>58.ImportedFromIB2</string>
 					<string>72.IBPluginDependency</string>
-					<string>72.ImportedFromIB2</string>
 					<string>73.IBPluginDependency</string>
-					<string>73.ImportedFromIB2</string>
 					<string>74.IBPluginDependency</string>
-					<string>74.ImportedFromIB2</string>
 					<string>75.IBPluginDependency</string>
-					<string>75.ImportedFromIB2</string>
 					<string>77.IBPluginDependency</string>
-					<string>77.ImportedFromIB2</string>
 					<string>78.IBPluginDependency</string>
-					<string>78.ImportedFromIB2</string>
 					<string>79.IBPluginDependency</string>
-					<string>79.ImportedFromIB2</string>
 					<string>80.IBPluginDependency</string>
-					<string>80.ImportedFromIB2</string>
 					<string>81.IBPluginDependency</string>
-					<string>81.ImportedFromIB2</string>
-					<string>81.editorWindowContentRectSynchronizationRect</string>
 					<string>82.IBPluginDependency</string>
-					<string>82.ImportedFromIB2</string>
 					<string>83.IBPluginDependency</string>
-					<string>83.ImportedFromIB2</string>
 					<string>92.IBPluginDependency</string>
-					<string>92.ImportedFromIB2</string>
 				</object>
-				<object class="NSMutableArray" key="dict.values">
+				<object class="NSArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>{{596, 852}, {216, 23}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>{{522, 812}, {146, 23}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>{{436, 809}, {64, 6}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>{{608, 612}, {275, 83}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>{{187, 434}, {243, 243}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>{{608, 612}, {167, 43}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>{{608, 612}, {241, 103}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>{{525, 802}, {197, 73}}</string>
-					<string>{{384, 285}, {478, 20}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>{74, 862}</string>
-					<string>{{6, 978}, {478, 20}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{475, 832}, {234, 43}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>{{608, 612}, {215, 63}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>{{517, 443}, {345, 177}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{517, 443}, {345, 177}}</string>
 					<integer value="1"/>
-					<string>{{33, 99}, {480, 360}}</string>
-					<string>{3.40282e+38, 3.40282e+38}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{437, 242}, {86, 43}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3122,7 +2977,6 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{523, 2}, {178, 283}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3156,68 +3010,44 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">AUMBAABCxgAAA</bytes>
-					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>{{396, 102}, {242, 183}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>{{23, 794}, {245, 183}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>{{145, 474}, {199, 203}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="unlocalizedProperties">
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<reference key="dict.sortedKeys" ref="1049"/>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
+				<reference key="dict.values" ref="1049"/>
 			</object>
 			<nil key="activeLocalization"/>
 			<object class="NSMutableDictionary" key="localizations">
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<reference key="dict.sortedKeys" ref="1049"/>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
+				<reference key="dict.values" ref="1049"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">467</int>
+			<int key="maxID">468</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -3232,7 +3062,7 @@
 							<string>sliderChanged:</string>
 							<string>smallSliderChanged:</string>
 						</object>
-						<object class="NSMutableArray" key="dict.values">
+						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>id</string>
 							<string>id</string>
@@ -3245,7 +3075,7 @@
 							<string>sliderChanged:</string>
 							<string>smallSliderChanged:</string>
 						</object>
-						<object class="NSMutableArray" key="dict.values">
+						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<object class="IBActionInfo">
 								<string key="name">sliderChanged:</string>
@@ -3264,7 +3094,7 @@
 							<string>sliderControl</string>
 							<string>smallSliderControl</string>
 						</object>
-						<object class="NSMutableArray" key="dict.values">
+						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>TMSliderControl</string>
 							<string>TMSliderControlSmall</string>
@@ -3277,7 +3107,7 @@
 							<string>sliderControl</string>
 							<string>smallSliderControl</string>
 						</object>
-						<object class="NSMutableArray" key="dict.values">
+						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<object class="IBToOneOutletInfo">
 								<string key="name">sliderControl</string>
@@ -3291,26 +3121,15 @@
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">AppController.h</string>
+						<string key="minorKey">./Classes/AppController.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">TMSliderControl</string>
 					<string key="superclassName">NSControl</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">target</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">target</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">target</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">TMSliderControl.h</string>
+						<string key="minorKey">./Classes/TMSliderControl.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -3318,600 +3137,7 @@
 					<string key="superclassName">TMSliderControl</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">TMSliderControlSmall.h</string>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSActionCell</string>
-					<string key="superclassName">NSCell</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSActionCell.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSApplication</string>
-					<string key="superclassName">NSResponder</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="562175024">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSApplication.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSApplication</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="124466103">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSApplicationScripting.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSApplication</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="696121047">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSColorPanel.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSApplication</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSHelpManager.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSApplication</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSPageLayout.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSApplication</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSUserInterfaceItemSearching.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSBrowser</string>
-					<string key="superclassName">NSControl</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSBrowser.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSCell</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSCell.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSControl</string>
-					<string key="superclassName">NSView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="22311809">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSControl.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSDocument</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>printDocument:</string>
-							<string>revertDocumentToSaved:</string>
-							<string>runPageLayout:</string>
-							<string>saveDocument:</string>
-							<string>saveDocumentAs:</string>
-							<string>saveDocumentTo:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>printDocument:</string>
-							<string>revertDocumentToSaved:</string>
-							<string>runPageLayout:</string>
-							<string>saveDocument:</string>
-							<string>saveDocumentAs:</string>
-							<string>saveDocumentTo:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBActionInfo">
-								<string key="name">printDocument:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">revertDocumentToSaved:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">runPageLayout:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">saveDocument:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">saveDocumentAs:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">saveDocumentTo:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSDocument.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSDocument</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSDocumentScripting.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSDocumentController</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>clearRecentDocuments:</string>
-							<string>newDocument:</string>
-							<string>openDocument:</string>
-							<string>saveAllDocuments:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>clearRecentDocuments:</string>
-							<string>newDocument:</string>
-							<string>openDocument:</string>
-							<string>saveAllDocuments:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBActionInfo">
-								<string key="name">clearRecentDocuments:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">newDocument:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">openDocument:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">saveAllDocuments:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSDocumentController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSFontManager</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="373227051">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSFontManager.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSFormatter</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSFormatter.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSMatrix</string>
-					<string key="superclassName">NSControl</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSMatrix.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSMenu</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="745285096">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSMenu.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSMenuItem</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="797176898">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSMenuItem.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSMovieView</string>
-					<string key="superclassName">NSView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSMovieView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSAccessibility.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<reference key="sourceIdentifier" ref="562175024"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<reference key="sourceIdentifier" ref="124466103"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<reference key="sourceIdentifier" ref="696121047"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<reference key="sourceIdentifier" ref="22311809"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSDictionaryController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSDragging.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<reference key="sourceIdentifier" ref="373227051"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSFontPanel.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSKeyValueBinding.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<reference key="sourceIdentifier" ref="745285096"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSNibLoading.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSOutlineView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSPasteboard.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSSavePanel.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="471991302">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSTableView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSToolbarItem.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="1046792445">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSArchiver.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSClassDescription.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSError.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSObjectScripting.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSPortCoder.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSScriptClassDescription.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSScriptKeyValueCoding.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSScriptObjectSpecifiers.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSScriptWhoseTests.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSURLDownload.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSResponder</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSInterfaceStyle.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSResponder</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSResponder.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSTableView</string>
-					<string key="superclassName">NSControl</string>
-					<reference key="sourceIdentifier" ref="471991302"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSText</string>
-					<string key="superclassName">NSView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSText.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSTextField</string>
-					<string key="superclassName">NSControl</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSTextField.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSTextFieldCell</string>
-					<string key="superclassName">NSActionCell</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSTextFieldCell.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSTextView</string>
-					<string key="superclassName">NSText</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSTextView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSClipView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSView</string>
-					<reference key="sourceIdentifier" ref="797176898"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSRulerView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSView</string>
-					<string key="superclassName">NSResponder</string>
-					<reference key="sourceIdentifier" ref="1046792445"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSWindow</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSDrawer.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSWindow</string>
-					<string key="superclassName">NSResponder</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSWindow.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSWindow</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSWindowScripting.h</string>
+						<string key="minorKey">./Classes/TMSliderControlSmall.h</string>
 					</object>
 				</object>
 			</object>
@@ -3922,16 +3148,11 @@
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
 			<integer value="1050" key="NS.object.0"/>
 		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1050" key="NS.object.0"/>
-		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
 			<integer value="3000" key="NS.object.0"/>
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<string key="IBDocument.LastKnownRelativeProjectPath">../TMSliderControl.xcodeproj</string>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -3940,10 +3161,10 @@
 				<string>NSMenuCheckmark</string>
 				<string>NSMenuMixedState</string>
 			</object>
-			<object class="NSMutableArray" key="dict.values">
+			<object class="NSArray" key="dict.values">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>{9, 8}</string>
-				<string>{7, 2}</string>
+				<string>{11, 11}</string>
+				<string>{10, 3}</string>
 			</object>
 		</object>
 	</data>
diff --git a/OverlayMask@2x.png b/OverlayMask@2x.png
new file mode 100644
index 0000000..2014747
Binary files /dev/null and b/OverlayMask@2x.png differ
diff --git a/SliderHandle@2x.png b/SliderHandle@2x.png
new file mode 100644
index 0000000..72639e3
Binary files /dev/null and b/SliderHandle@2x.png differ
diff --git a/SliderHandleDown@2x.png b/SliderHandleDown@2x.png
new file mode 100644
index 0000000..26c8891
Binary files /dev/null and b/SliderHandleDown@2x.png differ
diff --git a/SliderWell@2x.png b/SliderWell@2x.png
new file mode 100644
index 0000000..89001be
Binary files /dev/null and b/SliderWell@2x.png differ
diff --git a/SmallSliderHandle@2x.png b/SmallSliderHandle@2x.png
new file mode 100644
index 0000000..312aac1
Binary files /dev/null and b/SmallSliderHandle@2x.png differ
diff --git a/SmallSliderHandleDown@2x.png b/SmallSliderHandleDown@2x.png
new file mode 100644
index 0000000..372695b
Binary files /dev/null and b/SmallSliderHandleDown@2x.png differ
diff --git a/SmallSliderWellOff@2x.png b/SmallSliderWellOff@2x.png
new file mode 100644
index 0000000..7abb6a8
Binary files /dev/null and b/SmallSliderWellOff@2x.png differ
diff --git a/SmallSliderWellOn@2x.png b/SmallSliderWellOn@2x.png
new file mode 100644
index 0000000..debc9fe
Binary files /dev/null and b/SmallSliderWellOn@2x.png differ
diff --git a/TMSliderControl.h b/TMSliderControl.h
index 4615e03..2015771 100644
--- a/TMSliderControl.h
+++ b/TMSliderControl.h
@@ -8,49 +8,64 @@
 
 #import <Cocoa/Cocoa.h>
 
-typedef enum 
+typedef NS_ENUM(unsigned int, TMSliderControlState) 
 {
     kTMSliderControlState_Inactive = 0,
     kTMSliderControlState_Active = 1
   
-}TMSliderControlState;
+};
 
 @class TMSliderControlHandle;
 
-@interface TMSliderControl : NSControl {
-    NSImage *sliderWell;
-    NSImage *overlayMask;
-    NSImage *sliderHandle;
-    NSImage *sliderHandleDown;
-    TMSliderControlHandle *sliderHandleView;
+@interface TMSliderControl : NSView {
     
     // drawing 
-	NSRect handleControlRect;
-    NSRect handleControlRectOn;
-    NSRect handleControlRectOff;
-    NSPoint mouseDownPosition;
+    CGRect handleControlRectOn;
+    CGRect handleControlRectOff;
+    CGPoint mouseDownPosition;
     
     // state
-    TMSliderControlState controlState;
     BOOL hasDragged;
-    BOOL state;
+    
+    id observedObjectForState;
+    NSString *observedKeyPathForState;
 
-    id target;
-    SEL action;
+    id observedObjectForEnabled;
+    NSString *observedKeyPathForEnabled;
 }
 
+- (void)updateUI;
+
 // events
 - (void)mouseDown:(NSEvent*)theEvent;
 - (void)mouseDragged:(NSEvent*)theEvent;
 - (void)mouseUp:(NSEvent*)theEvent;
 
-- (BOOL)state;
-- (void)setState:(BOOL)newState;
+- (IBAction)moveLeft:(id)sender;
+- (IBAction)moveRight:(id)sender;
+
+- (void)layoutHandle;
+@property (nonatomic, readonly) CGFloat disabledOpacity;
+
+@property (nonatomic, strong) CALayer *sliderWell;
+@property (nonatomic, strong) CALayer *overlayMask;
+@property (nonatomic, strong) NSImage *sliderHandleImage;
+@property (nonatomic, strong) NSImage *sliderHandleDownImage;
+@property (nonatomic, strong) CALayer *sliderHandle;
+
+@property (nonatomic, assign) BOOL enabled;
+@property (nonatomic, assign) BOOL state;
+@property (nonatomic, unsafe_unretained) id target;
+@property (nonatomic, assign) SEL action;
+
+@property (nonatomic, strong) id observedObjectForState;
+@property (nonatomic, copy) NSString *observedKeyPathForState;
+
+@property (nonatomic, strong) id observedObjectForEnabled;
+@property (nonatomic, copy) NSString *observedKeyPathForEnabled;
 
-- (void)setTarget:(id)anObject;
-- (id)target;
-- (void)setAction:(SEL)aSelector;
-- (SEL)action;
+@property (nonatomic, strong) NSString *purposeDescription;
+@property (nonatomic, strong) NSString *accessibilityText;
 
 @end
 
diff --git a/TMSliderControl.m b/TMSliderControl.m
index f5d3084..42608cd 100644
--- a/TMSliderControl.m
+++ b/TMSliderControl.m
@@ -7,248 +7,357 @@
 //
 
 #import "TMSliderControl.h"
+#import <QuartzCore/QuartzCore.h>
 
-/*
- * Basic NSImageView subclass for handle
- */
+static void *StateObservationContext = (void *)2091;
+static void *EnabledObservationContext = (void *)2092;
 
-@interface TMSliderControlHandle : NSImageView {
-}
-@end
-@implementation TMSliderControlHandle
-- (void)mouseDown:(NSEvent *)theEvent   {    [[self superview] mouseDown:theEvent];     }
-- (void)mouseDragged:(NSEvent*)theEvent {    [[self superview] mouseDragged:theEvent];  }
-- (void)mouseUp:(NSEvent*)theEvent      {    [[self superview] mouseUp:theEvent];       }
-@end
+@implementation TMSliderControl
 
-/*
- * Private control methods
- */
+//bindings support
+@synthesize observedObjectForState;
+@synthesize observedKeyPathForState;
+@synthesize observedObjectForEnabled;
+@synthesize observedKeyPathForEnabled;
 
-@interface TMSliderControl (Private)
-- (void)drawBacking;
-- (void)drawOverlay;
-- (void)drawHandle;
-@end
 
-@implementation TMSliderControl (Private)
++ (void)initialize
+{
+    if (self != [TMSliderControl class])
+        return;
+    
+    [NSObject exposeBinding:@"state"];
+    [NSObject exposeBinding:@"enabled"];
+}
 
-- (void)drawBacking
+- (Class)valueClassForBinding:(NSString *)binding
 {
-    [sliderWell drawInRect:[self bounds] fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0];
+    // both require numbers
+    return [NSNumber class];    
 }
 
-- (void)drawOverlay
++ (NSImage*)sliderWellOn
 {
-    [overlayMask drawInRect:[self bounds] fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0];
+    return [NSImage imageNamed:@"SliderWell"];
 }
 
-- (void)drawHandle
++ (NSImage*)sliderWellOff
 {
-    NSImage *sliderImage;
-    if (controlState == kTMSliderControlState_Active)
-    {
-        sliderImage = sliderHandleDown;
-    }
-    else
-    {
-        sliderImage = sliderHandle;
-    }
-    [sliderHandleView setImage: sliderImage];
+    return [NSImage imageNamed:@"SliderWell"];
 }
 
-- (void)layoutHandle
++ (NSImage*)sliderHandleImage
 {
-    handleControlRectOff = NSMakeRect(-2,1, 44, 27);
-    handleControlRectOn = NSMakeRect([self bounds].size.width - 42,1, 44, 27);
-    handleControlRect = handleControlRectOff;
+    return [NSImage imageNamed:@"SliderHandle"];
 }
 
-@end
++ (NSImage*)sliderHandleDownImage
+{
+    return [NSImage imageNamed:@"SliderHandleDown"];
+}
 
-@implementation TMSliderControl
++ (NSImage*)overlayMask
+{
+    return [NSImage imageNamed:@"OverlayMask"];
+}
 
-- (id)initWithFrame:(NSRect)frame {
-    self = [super initWithFrame:frame];
-    if (self) {
+- (instancetype)initWithFrame:(NSRect)frame {
+    if ((self = [super initWithFrame:frame])) {
         // Initialization code here.
-        sliderWell = [[NSImage imageNamed:@"SliderWell"] retain];
-        overlayMask = [[NSImage imageNamed:@"OverlayMask"] retain];
-        sliderHandle = [[NSImage imageNamed:@"SliderHandle"] retain];
-        sliderHandleDown = [[NSImage imageNamed:@"SliderHandleDown"] retain];
         [self layoutHandle];
-        sliderHandleView = [[TMSliderControlHandle alloc] initWithFrame: handleControlRectOff];
-        [sliderHandleView setWantsLayer: YES];
-        [self addSubview: sliderHandleView];
-        state = NO;
-        //[self setWantsLayer:YES];
+
+		self.state = kTMSliderControlState_Inactive;
+        self.enabled = YES;
+        
+        self.sliderHandleImage = [[self class] sliderHandleImage];
+        self.sliderHandleDownImage = [[self class] sliderHandleDownImage];
+        
+        [self setLayer:[CALayer layer]];
+        [self setWantsLayer:YES];
+        
+        CALayer *mask = [CALayer layer];
+        mask.frame = self.bounds;
+        mask.contents = [[self class] sliderWellOff];
+        
+        self.sliderWell = [CALayer layer];
+        _sliderWell.frame = self.bounds;
+        _sliderWell.contents = [[self class] sliderWellOff];
+        _sliderWell.mask = mask;
+        [self.layer addSublayer:_sliderWell];
+        
+        self.sliderHandle = [CALayer layer];
+        _sliderHandle.frame = handleControlRectOff;
+        _sliderHandle.contents = _sliderHandleImage;
+        [_sliderWell addSublayer:_sliderHandle];
+
+        self.overlayMask = [CALayer layer];
+        _overlayMask.frame = self.bounds;
+        _overlayMask.contents = [[self class] overlayMask];
+        [self.layer addSublayer:_overlayMask];
     }
     return self;
 }
 
 - (void)dealloc
+{    
+    [self unbind:@"state"];
+    [self unbind:@"enabled"];
+
+
+    
+}
+
+- (void)updateUI
 {
-    [sliderWell release];
-    [overlayMask release];
-    [sliderHandle release];
-    [sliderHandleDown release];
-    [sliderHandleView release];
-    [super dealloc];
+    CGFloat newXPosition = (self.state == kTMSliderControlState_Active ? CGRectGetMidX(handleControlRectOn) : CGRectGetMidX(handleControlRectOff));
+    
+    CGPoint sliderPosition = _sliderHandle.position;
+    sliderPosition.x = newXPosition;
+    
+    _sliderHandle.position = sliderPosition;
+    self.layer.opacity = (float)(self.enabled ? 1.0f : [self disabledOpacity]);
 }
 
-- (void)awakeFromNib
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
 {
-    [self setWantsLayer:YES];
+    if(context == StateObservationContext)
+    {
+        NSNumber *value = [observedObjectForState valueForKey:observedKeyPathForState];
+        if(value)
+            [self setValue:value forKey:@"state"];
+    }
+    if(context == EnabledObservationContext)
+    {
+        NSNumber *value = [observedObjectForEnabled valueForKey:observedKeyPathForEnabled];
+        if(value)
+            [self setValue:value forKey:@"enabled"];
+    }
+    [self updateUI];
 }
 
-- (void)drawRect:(NSRect)rect {
-    [self drawBacking];
-    [self drawHandle];
-    [self drawOverlay];
+- (CGFloat)minimumMovement
+{
+    return 10.0f;
 }
 
 - (BOOL)acceptsFirstResponder
 {
-    return YES;
+    return [NSApp isFullKeyboardAccessEnabled];
+}
+
+- (BOOL)canBecomeKeyView
+{
+    return [NSApp isFullKeyboardAccessEnabled];
+}
+
+- (NSRect)focusRingMaskBounds
+{
+    return [self bounds];
+}
+
+- (void)drawFocusRingMask
+{
+    [self.layer renderInContext:[[NSGraphicsContext currentContext] graphicsPort]];
 }
 
 - (void)mouseDown:(NSEvent*)theEvent
 {
-	NSPoint mousePoint = [self convertPoint:[theEvent locationInWindow] fromView:nil];
-	hasDragged = NO;
-	// down on the position control rect
-	if(NSPointInRect(mousePoint,handleControlRect))
-	{
-		controlState = kTMSliderControlState_Active;
-        mouseDownPosition = NSMakePoint(mousePoint.x - handleControlRect.origin.x, 0);
-        [self setNeedsDisplay:YES];
-	}
+	if(self.enabled)
+    {
+        CGPoint mousePoint = NSPointToCGPoint([self convertPoint:[theEvent locationInWindow] fromView:nil]);
+        hasDragged = NO;
+        // down on the position control rect
+        if(CGRectContainsPoint(_sliderHandle.frame, mousePoint))
+        {
+            mouseDownPosition = CGPointMake(mousePoint.x - _sliderHandle.position.x, 0);
+            [CATransaction begin];
+            [CATransaction setDisableActions:YES];
+            _sliderHandle.contents = _sliderHandleDownImage;
+            [CATransaction commit];
+        }
+    }
 }
 
 
 - (void)mouseDragged:(NSEvent*)theEvent
 {
-	NSPoint mousePoint = [self convertPoint:[theEvent locationInWindow] fromView:nil];
-	hasDragged = YES;
-    
-	// dragging the position control rect
-	if(controlState == kTMSliderControlState_Active)
+	if(self.enabled)
 	{
+		NSPoint mousePoint = [self convertPoint:[theEvent locationInWindow] fromView:nil];
+		hasDragged = YES;
+		
 		// center the rect around the mouse point
         
-		float newXPosition = mousePoint.x - mouseDownPosition.x;
+		CGFloat newXPosition = mousePoint.x - mouseDownPosition.x;
         
         // clamp the position .
-        if (newXPosition < handleControlRectOff.origin.x)
-            newXPosition = handleControlRectOff.origin.x;
-        if (newXPosition > handleControlRectOn.origin.x)
-            newXPosition = handleControlRectOn.origin.x;
+        if (newXPosition < CGRectGetMidX(handleControlRectOff))
+            newXPosition = CGRectGetMidX(handleControlRectOff);
+        if (newXPosition > CGRectGetMidX(handleControlRectOn))
+            newXPosition = CGRectGetMidX(handleControlRectOn);
         
-        handleControlRect.origin.x = newXPosition;
-        [sliderHandleView setFrame: handleControlRect];
-        [self setNeedsDisplay:YES];
+        CGPoint sliderPosition = _sliderHandle.position;
+        sliderPosition.x = newXPosition;
+        
+        [CATransaction begin];
+        [CATransaction setDisableActions:YES];
+        _sliderHandle.position = sliderPosition;
+        [CATransaction commit];
 	}
 }
 
 
 - (void)mouseUp:(NSEvent*)theEvent
 {
-    float minimumMovement = 10.0;
-    if(controlState != kTMSliderControlState_Inactive)
-	{
-		// switch the state to inactive and redraw
-		controlState = kTMSliderControlState_Inactive;
-        if (!hasDragged)
-        {
-            // if they never dragged, but clicked/released in place on the handle, flip it over.
-            [self setState:![self state]];
-        }
-        else if (state == NSOffState)
+    if(self.enabled)
+    {
+        [CATransaction begin];
+        [CATransaction setDisableActions:YES];
+        _sliderHandle.contents = _sliderHandleImage;
+        [CATransaction commit];
+        
+        CGFloat minimumMovement = [self minimumMovement];
+        if(hasDragged && _state != kTMSliderControlState_Inactive)
         {
-            if (handleControlRect.origin.x > minimumMovement)
+            if (_sliderHandle.frame.origin.x < [self bounds].size.width - _sliderHandle.frame.size.width - minimumMovement)
             {
                 // moved it enough to set it
-                [self setState: NSOnState];
-            }
+                self.state = kTMSliderControlState_Inactive;
+                if (observedObjectForState)
+                {
+                    [observedObjectForState setValue: @(_state)
+                                          forKeyPath: observedKeyPathForState];
+                }
+           }
             else
             {
                 // put it back where it was.
-                [self setState: NSOffState];
+                self.state = kTMSliderControlState_Active;
+                if (observedObjectForState)
+                {
+                    [observedObjectForState setValue: @(_state)
+                                          forKeyPath: observedKeyPathForState];
+                }
             }
         }
         else
         {
-            if (handleControlRect.origin.x < [self bounds].size.width - handleControlRect.size.width - minimumMovement)
+            self.state = !self.state;
+            if (observedObjectForState)
             {
-                // moved it enough to set it
-                [self setState: NSOffState];
-            }
-            else
-            {
-                // put it back where it was.
-                [self setState: NSOnState];
+                [observedObjectForState setValue: @(_state)
+                                      forKeyPath: observedKeyPathForState];
             }
         }
+        [self updateUI];
 
-	}
-    else
-    {
-        [self setState:![self state]];
+        if(_target && [_target respondsToSelector:_action])
+            [_target performSelector:_action withObject:self];
+        hasDragged = NO;
     }
 }
 
+- (void)layoutHandle
+{
+    handleControlRectOff = CGRectMake(-2,1, 44, 27);
+    handleControlRectOn = CGRectMake([self bounds].size.width - handleControlRectOff.size.width + 2,1, 44, 27);
+}
+
+- (IBAction)moveLeft:(id)sender
+{
+    self.state = NO;
+}
+
+- (IBAction)moveRight:(id)sender
+{
+    self.state = YES;
+}
 
-- (BOOL)state
+- (CGFloat)disabledOpacity
 {
-    return state;
+	return 0.25;
 }
 
-- (void)setState:(NSInteger)newState
+- (void)drawRect:(NSRect)dirtyRect
 {
-    [super setState:newState];
-    if ([self state] == NSOffState)
+    [super drawRect:[self bounds]];
+}
+
+#pragma mark Bindings Support
+
+- (void)bind:(NSString *)binding toObject:(id)observable withKeyPath:(NSString *)keyPath options:(NSDictionary *)options
+{
+    if([binding isEqualToString:@"state"])
     {
-        handleControlRect = handleControlRectOff;
+        [observable addObserver:self forKeyPath:keyPath options:NSKeyValueObservingOptionNew context:StateObservationContext];
+        
+        [self setObservedObjectForState:observable];
+        [self setObservedKeyPathForState:keyPath];
     }
-    else
+    else if ([binding isEqualToString:@"enabled"])
     {
-        handleControlRect = handleControlRectOn;
+        [observable addObserver:self forKeyPath:keyPath options:NSKeyValueObservingOptionNew context:EnabledObservationContext];
+        
+        [self setObservedObjectForEnabled:observable];
+        [self setObservedKeyPathForEnabled:keyPath];
     }
-    
-    if ([sliderHandleView window])
+     
+    [super bind:binding toObject:observable withKeyPath:keyPath options:options];
+    [self updateUI];
+}
+
+- (void)unbind:bindingName
+{
+    if ([bindingName isEqualToString:@"state"])
     {
-        // It's in a window, we can use CoreAnimation
-        [NSAnimationContext beginGrouping];
-        [[NSAnimationContext currentContext] setDuration: 0.15];
-        [[sliderHandleView animator] setFrameOrigin: handleControlRect.origin];
-        [NSAnimationContext endGrouping];
-    }
-    else {
-        // It's not in a window, just set it.
-        [sliderHandleView setFrameOrigin:handleControlRect.origin];
+        [observedObjectForState removeObserver:self
+                                    forKeyPath:observedKeyPathForState];
+        [self setObservedObjectForState:nil];
+        [self setObservedKeyPathForState:nil];
+    }   
+    if ([bindingName isEqualToString:@"enabled"])
+    {
+        [observedObjectForEnabled removeObserver:self
+                                     forKeyPath:observedKeyPathForEnabled];
+        [self setObservedObjectForEnabled:nil];
+        [self setObservedKeyPathForEnabled:nil];
     }
-    
-    [self sendAction:[self action] to:[self target]];
-    [self setNeedsDisplay: YES];
+    [super unbind:bindingName];
+    [self updateUI];
 }
 
+#pragma mark -
 
-- (void)setTarget:(id)anObject
+- (void)setState:(BOOL)state
 {
-    target = anObject;
+	if (_state != state)
+	{
+		_state = state;
+		NSAccessibilityPostNotification(self, NSAccessibilityValueChangedNotification);
+	}
 }
-- (id)target
+
+#pragma mark - Accessibility
+
+- (id)accessibilityValue
 {
-    return target;
+    return [NSNumber numberWithBool:self.state];
 }
-- (void)setAction:(SEL)aSelector
+
+- (id)accessibilityLabel
 {
-    action = aSelector;
+    if (self.accessibilityText) {
+        return self.accessibilityText;
+    }
+    
+    return NSLocalizedStringWithDefaultValue(@"LOCALIZED_SWITCH_LABEL", @"Localizable", [NSBundle mainBundle], @"switch", @"switch label when no accessibility text is set");;
 }
-- (SEL)action
+
+- (BOOL)accessibilityPerformPress
 {
-    return action;
+    self.state = !self.state;
+    [self updateUI];
+    return YES;
 }
 
-
 @end
diff --git a/TMSliderControl.xcodeproj/project.pbxproj b/TMSliderControl.xcodeproj/project.pbxproj
index 892adad..be9ffcc 100644
--- a/TMSliderControl.xcodeproj/project.pbxproj
+++ b/TMSliderControl.xcodeproj/project.pbxproj
@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; };
-		5F8F327712BE9303009B2446 /* TMSliderControlSmall.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F8F327612BE9303009B2446 /* TMSliderControlSmall.m */; };
 		5F8F327D12BE951C009B2446 /* SmallSliderHandle.png in Resources */ = {isa = PBXBuildFile; fileRef = 5F8F327912BE951C009B2446 /* SmallSliderHandle.png */; };
 		5F8F327E12BE951C009B2446 /* SmallSliderHandleDown.png in Resources */ = {isa = PBXBuildFile; fileRef = 5F8F327A12BE951C009B2446 /* SmallSliderHandleDown.png */; };
 		5F8F327F12BE951C009B2446 /* SmallSliderWellOff.png in Resources */ = {isa = PBXBuildFile; fileRef = 5F8F327B12BE951C009B2446 /* SmallSliderWellOff.png */; };
@@ -22,6 +21,16 @@
 		8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
 		8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
 		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
+		938A6C0F154F47A6007FC919 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 938A6C0E154F47A6007FC919 /* QuartzCore.framework */; };
+		938A6C10154F48A0007FC919 /* TMSliderControlSmall.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F8F327612BE9303009B2446 /* TMSliderControlSmall.m */; };
+		93F216EE15E5BB7500343EB1 /* OverlayMask@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 93F216E615E5BB7500343EB1 /* OverlayMask@2x.png */; };
+		93F216EF15E5BB7500343EB1 /* SliderHandle@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 93F216E715E5BB7500343EB1 /* SliderHandle@2x.png */; };
+		93F216F015E5BB7500343EB1 /* SliderHandleDown@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 93F216E815E5BB7500343EB1 /* SliderHandleDown@2x.png */; };
+		93F216F115E5BB7500343EB1 /* SliderWell@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 93F216E915E5BB7500343EB1 /* SliderWell@2x.png */; };
+		93F216F215E5BB7500343EB1 /* SmallSliderHandle@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 93F216EA15E5BB7500343EB1 /* SmallSliderHandle@2x.png */; };
+		93F216F315E5BB7500343EB1 /* SmallSliderHandleDown@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 93F216EB15E5BB7500343EB1 /* SmallSliderHandleDown@2x.png */; };
+		93F216F415E5BB7500343EB1 /* SmallSliderWellOff@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 93F216EC15E5BB7500343EB1 /* SmallSliderWellOff@2x.png */; };
+		93F216F515E5BB7500343EB1 /* SmallSliderWellOn@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 93F216ED15E5BB7500343EB1 /* SmallSliderWellOn@2x.png */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -49,6 +58,15 @@
 		5F9409290F3656C900317331 /* OverlayMask.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = OverlayMask.png; sourceTree = "<group>"; };
 		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		8D1107320486CEB800E47090 /* TMSliderControl.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TMSliderControl.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		938A6C0E154F47A6007FC919 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = ../../../../../../../System/Library/Frameworks/QuartzCore.framework; sourceTree = "<group>"; };
+		93F216E615E5BB7500343EB1 /* OverlayMask@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "OverlayMask@2x.png"; sourceTree = "<group>"; };
+		93F216E715E5BB7500343EB1 /* SliderHandle@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "SliderHandle@2x.png"; sourceTree = "<group>"; };
+		93F216E815E5BB7500343EB1 /* SliderHandleDown@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "SliderHandleDown@2x.png"; sourceTree = "<group>"; };
+		93F216E915E5BB7500343EB1 /* SliderWell@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "SliderWell@2x.png"; sourceTree = "<group>"; };
+		93F216EA15E5BB7500343EB1 /* SmallSliderHandle@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "SmallSliderHandle@2x.png"; sourceTree = "<group>"; };
+		93F216EB15E5BB7500343EB1 /* SmallSliderHandleDown@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "SmallSliderHandleDown@2x.png"; sourceTree = "<group>"; };
+		93F216EC15E5BB7500343EB1 /* SmallSliderWellOff@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "SmallSliderWellOff@2x.png"; sourceTree = "<group>"; };
+		93F216ED15E5BB7500343EB1 /* SmallSliderWellOn@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "SmallSliderWellOn@2x.png"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -56,6 +74,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				938A6C0F154F47A6007FC919 /* QuartzCore.framework in Frameworks */,
 				8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -105,6 +124,7 @@
 		29B97314FDCFA39411CA2CEA /* TMSliderControl */ = {
 			isa = PBXGroup;
 			children = (
+				938A6C0E154F47A6007FC919 /* QuartzCore.framework */,
 				19C28FACFE9D520D11CA2CBB /* Products */,
 				080E96DDFE201D6D7F000001 /* Classes */,
 				29B97315FDCFA39411CA2CEA /* Other Sources */,
@@ -127,13 +147,21 @@
 			isa = PBXGroup;
 			children = (
 				5F8F327912BE951C009B2446 /* SmallSliderHandle.png */,
+				93F216EA15E5BB7500343EB1 /* SmallSliderHandle@2x.png */,
 				5F8F327A12BE951C009B2446 /* SmallSliderHandleDown.png */,
+				93F216EB15E5BB7500343EB1 /* SmallSliderHandleDown@2x.png */,
 				5F8F327B12BE951C009B2446 /* SmallSliderWellOff.png */,
+				93F216EC15E5BB7500343EB1 /* SmallSliderWellOff@2x.png */,
 				5F8F327C12BE951C009B2446 /* SmallSliderWellOn.png */,
+				93F216ED15E5BB7500343EB1 /* SmallSliderWellOn@2x.png */,
 				5F9409230F3656C900317331 /* SliderWell.png */,
+				93F216E915E5BB7500343EB1 /* SliderWell@2x.png */,
 				5F9409240F3656C900317331 /* SliderHandleDown.png */,
+				93F216E815E5BB7500343EB1 /* SliderHandleDown@2x.png */,
 				5F9409250F3656C900317331 /* SliderHandle.png */,
+				93F216E715E5BB7500343EB1 /* SliderHandle@2x.png */,
 				5F9409290F3656C900317331 /* OverlayMask.png */,
+				93F216E615E5BB7500343EB1 /* OverlayMask@2x.png */,
 				8D1107310486CEB800E47090 /* Info.plist */,
 				089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
 				1DDD58140DA1D0A300B32029 /* MainMenu.xib */,
@@ -210,6 +238,14 @@
 				5F8F327E12BE951C009B2446 /* SmallSliderHandleDown.png in Resources */,
 				5F8F327F12BE951C009B2446 /* SmallSliderWellOff.png in Resources */,
 				5F8F328012BE951C009B2446 /* SmallSliderWellOn.png in Resources */,
+				93F216EE15E5BB7500343EB1 /* OverlayMask@2x.png in Resources */,
+				93F216EF15E5BB7500343EB1 /* SliderHandle@2x.png in Resources */,
+				93F216F015E5BB7500343EB1 /* SliderHandleDown@2x.png in Resources */,
+				93F216F115E5BB7500343EB1 /* SliderWell@2x.png in Resources */,
+				93F216F215E5BB7500343EB1 /* SmallSliderHandle@2x.png in Resources */,
+				93F216F315E5BB7500343EB1 /* SmallSliderHandleDown@2x.png in Resources */,
+				93F216F415E5BB7500343EB1 /* SmallSliderWellOff@2x.png in Resources */,
+				93F216F515E5BB7500343EB1 /* SmallSliderWellOn@2x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -223,7 +259,7 @@
 				8D11072D0486CEB800E47090 /* main.m in Sources */,
 				5F9409190F36563700317331 /* TMSliderControl.m in Sources */,
 				5F9409200F36566000317331 /* AppController.m in Sources */,
-				5F8F327712BE9303009B2446 /* TMSliderControlSmall.m in Sources */,
+				938A6C10154F48A0007FC919 /* TMSliderControlSmall.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -283,26 +319,28 @@
 		C01FCF4F08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				ONLY_ACTIVE_ARCH = YES;
 				PREBINDING = NO;
-				SDKROOT = macosx10.5;
+				SDKROOT = "";
 			};
 			name = Debug;
 		};
 		C01FCF5008A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				PREBINDING = NO;
-				SDKROOT = macosx10.5;
+				SDKROOT = "";
 			};
 			name = Release;
 		};
diff --git a/TMSliderControlSmall.m b/TMSliderControlSmall.m
index 150e295..1f1f822 100644
--- a/TMSliderControlSmall.m
+++ b/TMSliderControlSmall.m
@@ -8,79 +8,57 @@
 
 #import "TMSliderControlSmall.h"
 
-@interface TMSliderControlSmall (Private)
-- (void)drawBacking;
-- (void)drawHandle;
-@end
-
-@implementation TMSliderControlSmall (Private)
+@implementation TMSliderControlSmall
 
-- (void)drawBacking
++ (NSImage*)sliderWellOn
 {
-    [sliderWellOff drawInRect:[self bounds] fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0];
-    CGFloat percentOn = (handleControlRect.origin.x - handleControlRectOff.origin.x) / (handleControlRectOn.origin.x - handleControlRectOff.origin.x);
-    [sliderWellOn drawInRect:[self bounds] fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:percentOn];
+    return [NSImage imageNamed:@"SmallSliderWellOn"];
 }
 
++ (NSImage*)sliderWellOff
+{
+    return [NSImage imageNamed:@"SmallSliderWellOff"];
+}
 
-- (void)drawHandle
++ (NSImage*)sliderHandleImage
 {
-    NSImage *sliderImage;
-    if (controlState == kTMSliderControlState_Active)
-    {
-        sliderImage = sliderHandleDown;
-    }
-    else
-    {
-        sliderImage = sliderHandle;
-    }
-    [sliderHandleView setImage: sliderImage];
+    return [NSImage imageNamed:@"SmallSliderHandle"];
 }
 
-- (void)layoutHandle
++ (NSImage*)sliderHandleDownImage
 {
-    handleControlRectOff = NSMakeRect(0,0, 27, 18);
-    handleControlRectOn = NSMakeRect([self bounds].size.width - 27, 0, 27, 18);
-    handleControlRect = handleControlRectOff;
+    return [NSImage imageNamed:@"SmallSliderHandleDown"];
 }
 
-@end
++ (NSImage*)overlayMask
+{
+    return nil;
+}
 
-@implementation TMSliderControlSmall
+- (void)updateUI
+{
+    [super updateUI];
 
-- (id)initWithFrame:(NSRect)frame {
-    self = [super initWithFrame:frame];
-    if (self) {
-        // Initialization code here.
-        sliderWellOn = [[NSImage imageNamed:@"SmallSliderWellOn"] retain];
-        sliderWellOff = [[NSImage imageNamed:@"SmallSliderWellOff"] retain];
+    sliderWell.contents = (self.state == kTMSliderControlState_Active ? [[self class] sliderWellOn] : [[self class] sliderWellOff]);
 
-        [sliderHandle release];
-        sliderHandle = [[NSImage imageNamed:@"SmallSliderHandle"] retain];
-        [sliderHandleDown release];
-        sliderHandleDown = [[NSImage imageNamed:@"SmallSliderHandleDown"] retain];
-        [self layoutHandle];
-    }
-    return self;
 }
 
 - (void)dealloc
 {
     [sliderWellOn release];
     [sliderWellOff release];
-    [sliderHandle release];
-    [sliderHandleDown release];
     [super dealloc];
 }
 
-- (void)drawRect:(NSRect)rect {
-    [self drawBacking];
-    [self drawHandle];
-}
-
 - (BOOL)isFlipped
 {
     return NO;
 }
 
+- (void)layoutHandle
+{
+    handleControlRectOff = CGRectMake(0,0, 27, 18);
+    handleControlRectOn = CGRectMake([self bounds].size.width - 27, 0, 27, 18);
+}
+
 @end