X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=English.lproj%2FMainMenu.xib;h=9cce48b7d2d880cea6fafbb4a9fec59b34cc19c3;hp=2e2b440547bda0ba63ccaa264acddef2a7f92ce3;hb=48186896d41ccb345e4678c53ab1480059c12d3d;hpb=ca998dd950f0b1900b21dc05cf57987d09b4e70e

diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 2e2b440..9cce48b 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -27,6 +27,8 @@
 			<string>NSScroller</string>
 			<string>NSSegmentedCell</string>
 			<string>NSSegmentedControl</string>
+			<string>NSSlider</string>
+			<string>NSSliderCell</string>
 			<string>NSSplitView</string>
 			<string>NSTableColumn</string>
 			<string>NSTableView</string>
@@ -62,7 +64,7 @@
 					<object class="NSMenuItem" id="694149608">
 						<reference key="NSMenu" ref="649796088"/>
 						<string key="NSTitle">Enjoyable</string>
-						<string key="NSKeyEquiv"/>
+						<string type="base64-UTF8" key="NSKeyEquiv">CA</string>
 						<int key="NSKeyEquivModMask">1048576</int>
 						<int key="NSMnemonicLoc">2147483647</int>
 						<object class="NSCustomResource" key="NSOnImage" id="35465992">
@@ -240,6 +242,7 @@
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="35465992"/>
 									<reference key="NSMixedImage" ref="502551668"/>
+									<int key="NSTag">1</int>
 								</object>
 							</array>
 						</object>
@@ -298,12 +301,33 @@
 							<string key="NSName">_NSWindowsMenu</string>
 						</object>
 					</object>
+					<object class="NSMenuItem" id="693056251">
+						<reference key="NSMenu" ref="649796088"/>
+						<string key="NSTitle">Help</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="35465992"/>
+						<reference key="NSMixedImage" ref="502551668"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="997802319">
+							<string key="NSTitle">Help</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="842970531">
+									<reference key="NSMenu" ref="997802319"/>
+									<string key="NSTitle">Enjoyable Help</string>
+									<string key="NSKeyEquiv">?</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+							</array>
+							<string key="NSName">_NSHelpMenu</string>
+						</object>
+					</object>
 				</array>
 				<string key="NSName">_NSMainMenu</string>
 			</object>
-			<object class="NSCustomObject" id="755631768">
-				<string key="NSClassName">NSFontManager</string>
-			</object>
 			<object class="NSWindowTemplate" id="808667431">
 				<int key="NSWindowStyleMask">15</int>
 				<int key="NSWindowBacking">2</int>
@@ -323,112 +347,94 @@
 					<int key="NSToolbarDisplayMode">2</int>
 					<int key="NSToolbarSizeMode">1</int>
 					<dictionary class="NSMutableDictionary" key="NSToolbarIBIdentifiedItems">
-						<object class="NSToolbarItem" key="4AC66688-76E8-47ED-AC0A-7462220A4019" id="496378711">
+						<object class="NSToolbarItem" key="2CB21E35-9CF1-4C67-9670-31139C914D10" id="985167622">
 							<object class="NSMutableString" key="NSToolbarItemIdentifier">
-								<characters key="NS.bytes">4AC66688-76E8-47ED-AC0A-7462220A4019</characters>
+								<characters key="NS.bytes">2CB21E35-9CF1-4C67-9670-31139C914D10</characters>
 							</object>
-							<string key="NSToolbarItemLabel">Custom View</string>
-							<string key="NSToolbarItemPaletteLabel">Custom View</string>
+							<string key="NSToolbarItemLabel">Enabled</string>
+							<string key="NSToolbarItemPaletteLabel">Enabled</string>
 							<nil key="NSToolbarItemToolTip"/>
-							<object class="NSButton" key="NSToolbarItemView" id="227597319">
-								<reference key="NSNextResponder"/>
+							<object class="NSButton" key="NSToolbarItemView" id="385218002">
+								<nil key="NSNextResponder"/>
 								<int key="NSvFlags">268</int>
-								<string key="NSFrame">{{0, 14}, {140, 25}}</string>
-								<reference key="NSSuperview"/>
-								<reference key="NSWindow"/>
+								<string key="NSFrame">{{7, 14}, {36, 25}}</string>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="NSEnabled">YES</bool>
-								<object class="NSButtonCell" key="NSCell" id="850080795">
-									<int key="NSCellFlags">-2080374784</int>
+								<object class="NSButtonCell" key="NSCell" id="422366518">
+									<int key="NSCellFlags">67108864</int>
 									<int key="NSCellFlags2">134217728</int>
-									<string key="NSContents">(default)</string>
+									<string key="NSContents"/>
 									<object class="NSFont" key="NSSupport" id="45863614">
 										<string key="NSName">LucidaGrande</string>
 										<double key="NSSize">13</double>
 										<int key="NSfFlags">1044</int>
 									</object>
 									<string key="NSCellIdentifier">_NS:9</string>
-									<reference key="NSControlView" ref="227597319"/>
-									<int key="NSButtonFlags">-2034483200</int>
+									<reference key="NSControlView" ref="385218002"/>
+									<int key="NSButtonFlags">-1228128256</int>
 									<int key="NSButtonFlags2">163</int>
-									<object class="NSCustomResource" key="NSNormalImage" id="13197350">
+									<object class="NSCustomResource" key="NSNormalImage" id="80448349">
 										<string key="NSClassName">NSImage</string>
-										<string key="NSResourceName">NSListViewTemplate</string>
+										<string key="NSResourceName">NSRightFacingTriangleTemplate</string>
 									</object>
 									<string key="NSAlternateContents"/>
 									<string key="NSKeyEquivalent"/>
-									<int key="NSPeriodicDelay">400</int>
-									<int key="NSPeriodicInterval">75</int>
+									<int key="NSPeriodicDelay">200</int>
+									<int key="NSPeriodicInterval">25</int>
 								</object>
 								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 							</object>
-							<reference key="NSToolbarItemImage" ref="13197350"/>
+							<reference key="NSToolbarItemImage" ref="80448349"/>
 							<nil key="NSToolbarItemTarget"/>
 							<nil key="NSToolbarItemAction"/>
-							<string key="NSToolbarItemMinSize">{13, 25}</string>
-							<string key="NSToolbarItemMaxSize">{141, 25}</string>
+							<string key="NSToolbarItemMinSize">{36, 25}</string>
+							<string key="NSToolbarItemMaxSize">{36, 25}</string>
 							<bool key="NSToolbarItemEnabled">YES</bool>
-							<bool key="NSToolbarItemAutovalidates">NO</bool>
+							<bool key="NSToolbarItemAutovalidates">YES</bool>
 							<int key="NSToolbarItemTag">0</int>
 							<bool key="NSToolbarIsUserRemovable">YES</bool>
 							<int key="NSToolbarItemVisibilityPriority">0</int>
 						</object>
-						<object class="NSToolbarItem" key="94389EFE-310F-4DB5-95F6-D4AEE8839979" id="981531896">
+						<object class="NSToolbarItem" key="4AC66688-76E8-47ED-AC0A-7462220A4019" id="496378711">
 							<object class="NSMutableString" key="NSToolbarItemIdentifier">
-								<characters key="NS.bytes">94389EFE-310F-4DB5-95F6-D4AEE8839979</characters>
+								<characters key="NS.bytes">4AC66688-76E8-47ED-AC0A-7462220A4019</characters>
 							</object>
-							<string key="NSToolbarItemLabel">Custom View</string>
-							<string key="NSToolbarItemPaletteLabel">Custom View</string>
+							<string key="NSToolbarItemLabel">Mapping Selector</string>
+							<string key="NSToolbarItemPaletteLabel">Mapping Selector</string>
 							<nil key="NSToolbarItemToolTip"/>
-							<object class="NSSegmentedControl" key="NSToolbarItemView" id="679083346">
-								<reference key="NSNextResponder"/>
+							<object class="NSButton" key="NSToolbarItemView" id="227597319">
+								<nil key="NSNextResponder"/>
 								<int key="NSvFlags">268</int>
-								<string key="NSFrame">{{5, 14}, {67, 25}}</string>
-								<reference key="NSSuperview"/>
-								<reference key="NSWindow"/>
+								<string key="NSFrame">{{0, 14}, {140, 25}}</string>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="NSEnabled">YES</bool>
-								<object class="NSSegmentedCell" key="NSCell" id="594076765">
+								<object class="NSButtonCell" key="NSCell" id="850080795">
 									<int key="NSCellFlags">67108864</int>
-									<int key="NSCellFlags2">0</int>
+									<int key="NSCellFlags2">134217728</int>
+									<string key="NSContents">(default)</string>
 									<reference key="NSSupport" ref="45863614"/>
 									<string key="NSCellIdentifier">_NS:9</string>
-									<reference key="NSControlView" ref="679083346"/>
-									<array class="NSMutableArray" key="NSSegmentImages">
-										<object class="NSSegmentItem">
-											<double key="NSSegmentItemWidth">32</double>
-											<object class="NSCustomResource" key="NSSegmentItemImage">
-												<string key="NSClassName">NSImage</string>
-												<string key="NSResourceName">NSPathTemplate</string>
-											</object>
-											<string key="NSSegmentItemLabel"/>
-											<string key="NSSegmentItemTooltip">Show and remap inputs</string>
-											<bool key="NSSegmentItemSelected">YES</bool>
-											<int key="NSSegmentItemImageScaling">0</int>
-										</object>
-										<object class="NSSegmentItem">
-											<double key="NSSegmentItemWidth">32</double>
-											<object class="NSCustomResource" key="NSSegmentItemImage">
-												<string key="NSClassName">NSImage</string>
-												<string key="NSResourceName">NSActionTemplate</string>
-											</object>
-											<string key="NSSegmentItemLabel"/>
-											<string key="NSSegmentItemTooltip">Run mapped actions</string>
-											<int key="NSSegmentItemTag">1</int>
-											<int key="NSSegmentItemImageScaling">0</int>
-										</object>
-									</array>
-									<int key="NSSegmentStyle">4</int>
+									<reference key="NSControlView" ref="227597319"/>
+									<int key="NSButtonFlags">918306816</int>
+									<int key="NSButtonFlags2">163</int>
+									<object class="NSCustomResource" key="NSNormalImage" id="13197350">
+										<string key="NSClassName">NSImage</string>
+										<string key="NSResourceName">NSListViewTemplate</string>
+									</object>
+									<string key="NSAlternateContents"/>
+									<string key="NSKeyEquivalent"/>
+									<int key="NSPeriodicDelay">400</int>
+									<int key="NSPeriodicInterval">75</int>
 								</object>
 								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 							</object>
-							<nil key="NSToolbarItemImage"/>
+							<reference key="NSToolbarItemImage" ref="13197350"/>
 							<nil key="NSToolbarItemTarget"/>
 							<nil key="NSToolbarItemAction"/>
-							<string key="NSToolbarItemMinSize">{67, 25}</string>
-							<string key="NSToolbarItemMaxSize">{67, 25}</string>
+							<string key="NSToolbarItemMinSize">{13, 25}</string>
+							<string key="NSToolbarItemMaxSize">{141, 25}</string>
 							<bool key="NSToolbarItemEnabled">YES</bool>
-							<bool key="NSToolbarItemAutovalidates">YES</bool>
+							<bool key="NSToolbarItemAutovalidates">NO</bool>
 							<int key="NSToolbarItemTag">0</int>
 							<bool key="NSToolbarIsUserRemovable">YES</bool>
 							<int key="NSToolbarItemVisibilityPriority">0</int>
@@ -461,15 +467,15 @@
 							</object>
 						</object>
 					</dictionary>
-					<array class="NSMutableArray" key="NSToolbarIBAllowedItems">
+					<array key="NSToolbarIBAllowedItems">
 						<reference ref="496378711"/>
-						<reference ref="981531896"/>
 						<reference ref="658903347"/>
+						<reference ref="985167622"/>
 					</array>
 					<array key="NSToolbarIBDefaultItems">
 						<reference ref="496378711"/>
 						<reference ref="658903347"/>
-						<reference ref="981531896"/>
+						<reference ref="985167622"/>
 					</array>
 					<array key="NSToolbarIBSelectableItems" id="0"/>
 				</object>
@@ -501,7 +507,7 @@
 															<string key="NSFrameSize">{200, 298}</string>
 															<reference key="NSSuperview" ref="698362889"/>
 															<reference key="NSWindow"/>
-															<reference key="NSNextKeyView" ref="1036252745"/>
+															<reference key="NSNextKeyView" ref="892486973"/>
 															<bool key="NSEnabled">YES</bool>
 															<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 															<bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@ -631,7 +637,7 @@
 											<string key="NSFrameSize">{202, 300}</string>
 											<reference key="NSSuperview" ref="977242492"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="892486973"/>
+											<reference key="NSNextKeyView" ref="698362889"/>
 											<int key="NSsFlags">150034</int>
 											<reference key="NSVScroller" ref="1036252745"/>
 											<reference key="NSHScroller" ref="892486973"/>
@@ -652,38 +658,99 @@
 									<reference key="NSNextResponder" ref="206489479"/>
 									<int key="NSvFlags">256</int>
 									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSSlider" id="792189805">
+											<reference key="NSNextResponder" ref="606740242"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{228, 52}, {140, 12}}</string>
+											<reference key="NSSuperview" ref="606740242"/>
+											<reference key="NSWindow"/>
+											<string key="NSReuseIdentifierKey">_NS:9</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSSliderCell" key="NSCell" id="423057230">
+												<int key="NSCellFlags">-2080374784</int>
+												<int key="NSCellFlags2">262144</int>
+												<string key="NSContents"/>
+												<string key="NSCellIdentifier">_NS:9</string>
+												<reference key="NSControlView" ref="792189805"/>
+												<double key="NSMaxValue">30</double>
+												<double key="NSMinValue">0.0</double>
+												<double key="NSValue">15</double>
+												<double key="NSAltIncValue">0.0</double>
+												<int key="NSNumberOfTickMarks">0</int>
+												<int key="NSTickMarkPosition">1</int>
+												<bool key="NSAllowsTickMarkValuesOnly">NO</bool>
+												<bool key="NSVertical">NO</bool>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSSlider" id="385416822">
+											<reference key="NSNextResponder" ref="606740242"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{228, 120}, {176, 12}}</string>
+											<reference key="NSSuperview" ref="606740242"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="125828224"/>
+											<string key="NSReuseIdentifierKey">_NS:9</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSSliderCell" key="NSCell" id="5417367">
+												<int key="NSCellFlags">-2080374784</int>
+												<int key="NSCellFlags2">262144</int>
+												<string key="NSContents"/>
+												<string key="NSCellIdentifier">_NS:9</string>
+												<reference key="NSControlView" ref="385416822"/>
+												<double key="NSMaxValue">20</double>
+												<double key="NSMinValue">0.0</double>
+												<double key="NSValue">4</double>
+												<double key="NSAltIncValue">0.0</double>
+												<int key="NSNumberOfTickMarks">0</int>
+												<int key="NSTickMarkPosition">1</int>
+												<bool key="NSAllowsTickMarkValuesOnly">NO</bool>
+												<bool key="NSVertical">NO</bool>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
 										<object class="NSSegmentedControl" id="875916470">
 											<reference key="NSNextResponder" ref="606740242"/>
 											<int key="NSvFlags">265</int>
-											<string key="NSFrame">{{227, 123}, {180, 24}}</string>
+											<string key="NSFrame">{{227, 132}, {178, 15}}</string>
 											<reference key="NSSuperview" ref="606740242"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="125828224"/>
+											<reference key="NSNextKeyView" ref="385416822"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSSegmentedCell" key="NSCell" id="241270212">
 												<int key="NSCellFlags">67108864</int>
-												<int key="NSCellFlags2">0</int>
-												<object class="NSFont" key="NSSupport" id="515740949">
+												<int key="NSCellFlags2">262144</int>
+												<object class="NSFont" key="NSSupport" id="22">
 													<string key="NSName">LucidaGrande</string>
-													<double key="NSSize">13</double>
-													<int key="NSfFlags">16</int>
+													<double key="NSSize">9</double>
+													<int key="NSfFlags">3614</int>
 												</object>
 												<string key="NSCellIdentifier">_NS:9</string>
 												<reference key="NSControlView" ref="875916470"/>
 												<array class="NSMutableArray" key="NSSegmentImages">
 													<object class="NSSegmentItem">
-														<double key="NSSegmentItemWidth">87</double>
-														<string key="NSSegmentItemLabel">Horizontal</string>
+														<double key="NSSegmentItemWidth">43</double>
+														<string key="NSSegmentItemLabel">←</string>
 														<bool key="NSSegmentItemSelected">YES</bool>
 														<int key="NSSegmentItemImageScaling">0</int>
 													</object>
 													<object class="NSSegmentItem">
-														<double key="NSSegmentItemWidth">86</double>
-														<string key="NSSegmentItemLabel">Vertical</string>
+														<double key="NSSegmentItemWidth">43</double>
+														<string key="NSSegmentItemLabel">→</string>
 														<int key="NSSegmentItemTag">1</int>
 														<int key="NSSegmentItemImageScaling">0</int>
 													</object>
+													<object class="NSSegmentItem">
+														<double key="NSSegmentItemWidth">42</double>
+														<string key="NSSegmentItemLabel">↑</string>
+														<int key="NSSegmentItemImageScaling">0</int>
+													</object>
+													<object class="NSSegmentItem">
+														<double key="NSSegmentItemWidth">41</double>
+														<string key="NSSegmentItemLabel">↓</string>
+														<int key="NSSegmentItemImageScaling">0</int>
+													</object>
 												</array>
 												<int key="NSSegmentStyle">1</int>
 											</object>
@@ -692,30 +759,43 @@
 										<object class="NSSegmentedControl" id="921829691">
 											<reference key="NSNextResponder" ref="606740242"/>
 											<int key="NSvFlags">265</int>
-											<string key="NSFrame">{{227, 55}, {180, 24}}</string>
+											<string key="NSFrame">{{227, 64}, {178, 15}}</string>
 											<reference key="NSSuperview" ref="606740242"/>
 											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="792189805"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSSegmentedCell" key="NSCell" id="301345285">
 												<int key="NSCellFlags">67108864</int>
-												<int key="NSCellFlags2">0</int>
-												<reference key="NSSupport" ref="515740949"/>
+												<int key="NSCellFlags2">262144</int>
+												<reference key="NSSupport" ref="22"/>
 												<string key="NSCellIdentifier">_NS:9</string>
 												<reference key="NSControlView" ref="921829691"/>
 												<array class="NSMutableArray" key="NSSegmentImages">
 													<object class="NSSegmentItem">
-														<double key="NSSegmentItemWidth">87</double>
-														<string key="NSSegmentItemLabel">Up</string>
+														<double key="NSSegmentItemWidth">68</double>
+														<string key="NSSegmentItemLabel">↑</string>
+														<string key="NSSegmentItemTooltip">Scroll up continuously</string>
 														<bool key="NSSegmentItemSelected">YES</bool>
 														<int key="NSSegmentItemImageScaling">0</int>
 													</object>
 													<object class="NSSegmentItem">
-														<double key="NSSegmentItemWidth">86</double>
-														<string key="NSSegmentItemLabel">Down</string>
+														<double key="NSSegmentItemWidth">67</double>
+														<string key="NSSegmentItemLabel">↓</string>
+														<string key="NSSegmentItemTooltip">Scroll down continuously</string>
 														<int key="NSSegmentItemTag">1</int>
 														<int key="NSSegmentItemImageScaling">0</int>
 													</object>
+													<object class="NSSegmentItem">
+														<string key="NSSegmentItemLabel">⤒</string>
+														<string key="NSSegmentItemTooltip">Scroll up one step</string>
+														<int key="NSSegmentItemImageScaling">0</int>
+													</object>
+													<object class="NSSegmentItem">
+														<string key="NSSegmentItemLabel">⤓</string>
+														<string key="NSSegmentItemTooltip">Scroll down one step</string>
+														<int key="NSSegmentItemImageScaling">0</int>
+													</object>
 												</array>
 												<int key="NSSegmentStyle">1</int>
 											</object>
@@ -724,7 +804,7 @@
 										<object class="NSSegmentedControl" id="125828224">
 											<reference key="NSNextResponder" ref="606740242"/>
 											<int key="NSvFlags">265</int>
-											<string key="NSFrame">{{227, 89}, {180, 24}}</string>
+											<string key="NSFrame">{{226, 89}, {180, 24}}</string>
 											<reference key="NSSuperview" ref="606740242"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="921829691"/>
@@ -733,7 +813,11 @@
 											<object class="NSSegmentedCell" key="NSCell" id="514491330">
 												<int key="NSCellFlags">67108864</int>
 												<int key="NSCellFlags2">0</int>
-												<reference key="NSSupport" ref="515740949"/>
+												<object class="NSFont" key="NSSupport">
+													<string key="NSName">LucidaGrande</string>
+													<double key="NSSize">13</double>
+													<int key="NSfFlags">16</int>
+												</object>
 												<string key="NSCellIdentifier">_NS:9</string>
 												<reference key="NSControlView" ref="125828224"/>
 												<array class="NSMutableArray" key="NSSegmentImages">
@@ -757,7 +841,7 @@
 										<object class="NSCustomView" id="57697638">
 											<reference key="NSNextResponder" ref="606740242"/>
 											<int key="NSvFlags">265</int>
-											<string key="NSFrame">{{229, 190}, {176, 24}}</string>
+											<string key="NSFrame">{{228, 190}, {176, 24}}</string>
 											<reference key="NSSuperview" ref="606740242"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="194275224"/>
@@ -767,7 +851,7 @@
 										<object class="NSPopUpButton" id="194275224">
 											<reference key="NSNextResponder" ref="606740242"/>
 											<int key="NSvFlags">265</int>
-											<string key="NSFrame">{{226, 156}, {182, 26}}</string>
+											<string key="NSFrame">{{225, 156}, {182, 26}}</string>
 											<reference key="NSSuperview" ref="606740242"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="875916470"/>
@@ -800,7 +884,7 @@
 										<object class="NSMatrix" id="120408205">
 											<reference key="NSNextResponder" ref="606740242"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{20, 16}, {201, 236}}</string>
+											<string key="NSFrame">{{20, 16}, {200, 236}}</string>
 											<reference key="NSSuperview" ref="606740242"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="57697638"/>
@@ -832,7 +916,7 @@
 												<object class="NSButtonCell" id="387494389">
 													<int key="NSCellFlags">603979776</int>
 													<int key="NSCellFlags2">0</int>
-													<string key="NSContents">Press a key:</string>
+													<string key="NSContents">Press a key</string>
 													<reference key="NSSupport" ref="45863614"/>
 													<reference key="NSControlView" ref="120408205"/>
 													<int key="NSButtonFlags">1211912448</int>
@@ -860,7 +944,7 @@
 												<object class="NSButtonCell" id="820968178">
 													<int key="NSCellFlags">603979776</int>
 													<int key="NSCellFlags2">0</int>
-													<string key="NSContents">Mouse movement</string>
+													<string key="NSContents">Move the mouse</string>
 													<reference key="NSSupport" ref="45863614"/>
 													<reference key="NSControlView" ref="120408205"/>
 													<int key="NSButtonFlags">1211912448</int>
@@ -874,7 +958,7 @@
 												<object class="NSButtonCell" id="275466816">
 													<int key="NSCellFlags">603979776</int>
 													<int key="NSCellFlags2">0</int>
-													<string key="NSContents">Mouse button</string>
+													<string key="NSContents">Press a mouse button</string>
 													<reference key="NSSupport" ref="45863614"/>
 													<reference key="NSControlView" ref="120408205"/>
 													<int key="NSButtonFlags">1211912448</int>
@@ -888,7 +972,7 @@
 												<object class="NSButtonCell" id="134694197">
 													<int key="NSCellFlags">603979776</int>
 													<int key="NSCellFlags2">0</int>
-													<string key="NSContents">Mouse scroll</string>
+													<string key="NSContents">Scroll the mouse</string>
 													<reference key="NSSupport" ref="45863614"/>
 													<reference key="NSControlView" ref="120408205"/>
 													<int key="NSButtonFlags">1211912448</int>
@@ -914,7 +998,7 @@
 													<int key="NSPeriodicInterval">75</int>
 												</object>
 											</array>
-											<string key="NSCellSize">{201, 32}</string>
+											<string key="NSCellSize">{200, 32}</string>
 											<string key="NSIntercellSpacing">{4, 2}</string>
 											<int key="NSMatrixFlags">1353195520</int>
 											<string key="NSCellClass">NSActionCell</string>
@@ -959,7 +1043,7 @@
 													<double key="NSSize">13</double>
 													<int key="NSfFlags">16</int>
 												</object>
-												<string key="NSPlaceholderString">No action selected</string>
+												<string key="NSPlaceholderString">No input selected</string>
 												<reference key="NSControlView" ref="1016088174"/>
 												<reference key="NSBackgroundColor" ref="473846075"/>
 												<reference key="NSTextColor" ref="813255721"/>
@@ -1036,10 +1120,10 @@
 									<object class="NSTableView" id="762432499">
 										<reference key="NSNextResponder" ref="947403733"/>
 										<int key="NSvFlags">256</int>
-										<string key="NSFrameSize">{196, 256}</string>
+										<string key="NSFrameSize">{198, 198}</string>
 										<reference key="NSSuperview" ref="947403733"/>
 										<reference key="NSWindow"/>
-										<reference key="NSNextKeyView" ref="968378655"/>
+										<reference key="NSNextKeyView" ref="553414014"/>
 										<bool key="NSEnabled">YES</bool>
 										<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										<bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@ -1082,7 +1166,7 @@
 										<reference key="NSBackgroundColor" ref="834857663"/>
 										<reference key="NSGridColor" ref="133906332"/>
 										<double key="NSRowHeight">20</double>
-										<int key="NSTvFlags">48267264</int>
+										<int key="NSTvFlags">44072960</int>
 										<reference key="NSDelegate"/>
 										<reference key="NSDataSource"/>
 										<int key="NSColumnAutoresizingStyle">1</int>
@@ -1094,7 +1178,7 @@
 										<int key="NSTableViewRowSizeStyle">-1</int>
 									</object>
 								</array>
-								<string key="NSFrame">{{2, 2}, {196, 256}}</string>
+								<string key="NSFrame">{{1, 1}, {198, 198}}</string>
 								<reference key="NSSuperview" ref="443618264"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="762432499"/>
@@ -1128,11 +1212,11 @@
 								<double key="NSPercent">0.98123324396782841</double>
 							</object>
 						</array>
-						<string key="NSFrame">{{0, 54}, {200, 260}}</string>
+						<string key="NSFrame">{{0, 20}, {200, 200}}</string>
 						<reference key="NSSuperview" ref="671181514"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="553414014"/>
-						<int key="NSsFlags">150035</int>
+						<reference key="NSNextKeyView" ref="947403733"/>
+						<int key="NSsFlags">150034</int>
 						<reference key="NSVScroller" ref="968378655"/>
 						<reference key="NSHScroller" ref="553414014"/>
 						<reference key="NSContentView" ref="947403733"/>
@@ -1141,28 +1225,52 @@
 						<double key="NSMaxMagnification">4</double>
 						<double key="NSMagnification">1</double>
 					</object>
+					<object class="NSButton" id="149148392">
+						<reference key="NSNextResponder" ref="671181514"/>
+						<int key="NSvFlags">268</int>
+						<string key="NSFrame">{{66, -1}, {134, 23}}</string>
+						<reference key="NSSuperview" ref="671181514"/>
+						<reference key="NSWindow"/>
+						<string key="NSReuseIdentifierKey">_NS:22</string>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSButtonCell" key="NSCell" id="517346822">
+							<int key="NSCellFlags">-2080374784</int>
+							<int key="NSCellFlags2">168034304</int>
+							<string key="NSContents"/>
+							<reference key="NSSupport" ref="22"/>
+							<string key="NSCellIdentifier">_NS:22</string>
+							<reference key="NSControlView" ref="149148392"/>
+							<int key="NSButtonFlags">1221349376</int>
+							<int key="NSButtonFlags2">162</int>
+							<string key="NSAlternateContents"/>
+							<string key="NSKeyEquivalent"/>
+							<int key="NSPeriodicDelay">400</int>
+							<int key="NSPeriodicInterval">75</int>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+					</object>
 					<object class="NSButton" id="861276216">
 						<reference key="NSNextResponder" ref="671181514"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{20, 19}, {39, 28}}</string>
+						<string key="NSFrame">{{0, -1}, {34, 23}}</string>
 						<reference key="NSSuperview" ref="671181514"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="456935010"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="867532725">
 							<int key="NSCellFlags">67108864</int>
-							<int key="NSCellFlags2">134217728</int>
+							<int key="NSCellFlags2">134479872</int>
 							<string key="NSContents"/>
-							<reference key="NSSupport" ref="45863614"/>
+							<reference key="NSSupport" ref="22"/>
 							<reference key="NSControlView" ref="861276216"/>
 							<int key="NSButtonFlags">-2033958912</int>
-							<int key="NSButtonFlags2">162</int>
+							<int key="NSButtonFlags2">268435618</int>
 							<object class="NSCustomResource" key="NSNormalImage">
 								<string key="NSClassName">NSImage</string>
 								<string key="NSResourceName">NSAddTemplate</string>
 							</object>
 							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
+							<string key="NSKeyEquivalent">n</string>
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
 						</object>
@@ -1171,31 +1279,32 @@
 					<object class="NSButton" id="456935010">
 						<reference key="NSNextResponder" ref="671181514"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{67, 19}, {39, 28}}</string>
+						<string key="NSFrame">{{33, -1}, {34, 23}}</string>
 						<reference key="NSSuperview" ref="671181514"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="149148392"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="1008023024">
-							<int key="NSCellFlags">603979776</int>
-							<int key="NSCellFlags2">134217728</int>
+							<int key="NSCellFlags">67108864</int>
+							<int key="NSCellFlags2">134479872</int>
 							<string key="NSContents"/>
-							<reference key="NSSupport" ref="45863614"/>
+							<reference key="NSSupport" ref="22"/>
 							<reference key="NSControlView" ref="456935010"/>
 							<int key="NSButtonFlags">-2033958912</int>
-							<int key="NSButtonFlags2">162</int>
+							<int key="NSButtonFlags2">268435618</int>
 							<object class="NSCustomResource" key="NSNormalImage">
 								<string key="NSClassName">NSImage</string>
 								<string key="NSResourceName">NSRemoveTemplate</string>
 							</object>
 							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
+							<string type="base64-UTF8" key="NSKeyEquivalent">CA</string>
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
 						</object>
 						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 				</array>
-				<string key="NSFrameSize">{200, 314}</string>
+				<string key="NSFrameSize">{200, 220}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="443618264"/>
@@ -1249,6 +1358,14 @@
 					</object>
 					<int key="connectionID">732</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">showHelp:</string>
+						<reference key="source" ref="1050"/>
+						<reference key="destination" ref="842970531"/>
+					</object>
+					<int key="connectionID">870</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">orderFrontStandardAboutPanel:</string>
@@ -1345,45 +1462,29 @@
 					</object>
 					<int key="connectionID">826</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">translatingEventsChanged:</string>
-						<reference key="source" ref="1007832501"/>
-						<reference key="destination" ref="679083346"/>
-					</object>
-					<int key="connectionID">858</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">translatingEventsSetting</string>
+						<string key="label">translatingEventsMenu</string>
 						<reference key="source" ref="1007832501"/>
-						<reference key="destination" ref="679083346"/>
+						<reference key="destination" ref="632598200"/>
 					</object>
-					<int key="connectionID">859</int>
+					<int key="connectionID">877</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">mainWindow</string>
-						<reference key="source" ref="207406104"/>
-						<reference key="destination" ref="808667431"/>
+					<object class="IBActionConnection" key="connection">
+						<string key="label">translatingEventsChanged:</string>
+						<reference key="source" ref="1007832501"/>
+						<reference key="destination" ref="385218002"/>
 					</object>
-					<int key="connectionID">500</int>
+					<int key="connectionID">878</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">activeMenuItem</string>
-						<reference key="source" ref="207406104"/>
-						<reference key="destination" ref="632598200"/>
-					</object>
-					<int key="connectionID">607</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleActivity:</string>
-						<reference key="source" ref="207406104"/>
-						<reference key="destination" ref="632598200"/>
+						<string key="label">translatingEventsButton</string>
+						<reference key="source" ref="1007832501"/>
+						<reference key="destination" ref="385218002"/>
 					</object>
-					<int key="connectionID">610</int>
+					<int key="connectionID">879</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
@@ -1411,19 +1512,11 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">outputController</string>
+						<string key="label">window</string>
 						<reference key="source" ref="207406104"/>
-						<reference key="destination" ref="801536542"/>
-					</object>
-					<int key="connectionID">825</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">addPressed:</string>
-						<reference key="source" ref="468285243"/>
-						<reference key="destination" ref="861276216"/>
+						<reference key="destination" ref="808667431"/>
 					</object>
-					<int key="connectionID">515</int>
+					<int key="connectionID">865</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
@@ -1497,6 +1590,14 @@
 					</object>
 					<int key="connectionID">857</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">addPressed:</string>
+						<reference key="source" ref="468285243"/>
+						<reference key="destination" ref="861276216"/>
+					</object>
+					<int key="connectionID">515</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">dataSource</string>
@@ -1609,21 +1710,45 @@
 					</object>
 					<int key="connectionID">823</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">inputController</string>
+						<reference key="source" ref="801536542"/>
+						<reference key="destination" ref="1007832501"/>
+					</object>
+					<int key="connectionID">828</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">mappingChosen:</string>
+						<string key="label">mouseSpeedChanged:</string>
 						<reference key="source" ref="801536542"/>
-						<reference key="destination" ref="194275224"/>
+						<reference key="destination" ref="385416822"/>
 					</object>
-					<int key="connectionID">824</int>
+					<int key="connectionID">885</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">inputController</string>
+						<string key="label">mouseSpeedSlider</string>
 						<reference key="source" ref="801536542"/>
-						<reference key="destination" ref="1007832501"/>
+						<reference key="destination" ref="385416822"/>
 					</object>
-					<int key="connectionID">828</int>
+					<int key="connectionID">886</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">scrollSpeedChanged:</string>
+						<reference key="source" ref="801536542"/>
+						<reference key="destination" ref="792189805"/>
+					</object>
+					<int key="connectionID">890</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">scrollSpeedSlider</string>
+						<reference key="source" ref="801536542"/>
+						<reference key="destination" ref="792189805"/>
+					</object>
+					<int key="connectionID">891</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
@@ -1633,6 +1758,14 @@
 					</object>
 					<int key="connectionID">818</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performClick:</string>
+						<reference key="source" ref="227597319"/>
+						<reference key="destination" ref="914355947"/>
+					</object>
+					<int key="connectionID">871</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">view</string>
@@ -1657,6 +1790,14 @@
 					</object>
 					<int key="connectionID">853</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performClick:</string>
+						<reference key="source" ref="385218002"/>
+						<reference key="destination" ref="632598200"/>
+					</object>
+					<int key="connectionID">880</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -1691,9 +1832,10 @@
 							<reference ref="713487014"/>
 							<reference ref="694149608"/>
 							<reference ref="379814623"/>
+							<reference ref="693056251"/>
 						</array>
 						<reference key="parent" ref="0"/>
-						<string key="objectName">MainMenu</string>
+						<string key="objectName">Main Menu</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">19</int>
@@ -1833,11 +1975,6 @@
 						<reference key="object" ref="1011231497"/>
 						<reference key="parent" ref="835318025"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">420</int>
-						<reference key="object" ref="755631768"/>
-						<reference key="parent" ref="0"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">450</int>
 						<reference key="object" ref="808667431"/>
@@ -1852,11 +1989,12 @@
 						<reference key="object" ref="671181514"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="443618264"/>
-							<reference ref="861276216"/>
 							<reference ref="456935010"/>
+							<reference ref="149148392"/>
+							<reference ref="861276216"/>
 						</array>
 						<reference key="parent" ref="0"/>
-						<string key="objectName">Drawer Content View</string>
+						<string key="objectName">Mapping List Popover Content</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">453</int>
@@ -1893,6 +2031,7 @@
 							<reference ref="827961598"/>
 						</array>
 						<reference key="parent" ref="443618264"/>
+						<string key="objectName">Mapping List</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">461</int>
@@ -1911,31 +2050,17 @@
 						<int key="objectID">482</int>
 						<reference key="object" ref="207406104"/>
 						<reference key="parent" ref="0"/>
-						<string key="objectName">ApplicationController</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">487</int>
 						<reference key="object" ref="1043384830"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="496378711"/>
-							<reference ref="981531896"/>
 							<reference ref="658903347"/>
+							<reference ref="985167622"/>
 						</array>
 						<reference key="parent" ref="808667431"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">507</int>
-						<reference key="object" ref="861276216"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="867532725"/>
-						</array>
-						<reference key="parent" ref="671181514"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">508</int>
-						<reference key="object" ref="867532725"/>
-						<reference key="parent" ref="861276216"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">511</int>
 						<reference key="object" ref="456935010"/>
@@ -1943,6 +2068,7 @@
 							<reference ref="1008023024"/>
 						</array>
 						<reference key="parent" ref="671181514"/>
+						<string key="objectName">Remove Mapping</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">512</int>
@@ -1953,13 +2079,11 @@
 						<int key="objectID">514</int>
 						<reference key="object" ref="468285243"/>
 						<reference key="parent" ref="0"/>
-						<string key="objectName">ConfigsController</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">479</int>
 						<reference key="object" ref="1007832501"/>
 						<reference key="parent" ref="0"/>
-						<string key="objectName">JoystickController</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">606</int>
@@ -1982,6 +2106,7 @@
 							<reference ref="364857164"/>
 						</array>
 						<reference key="parent" ref="206489479"/>
+						<string key="objectName">Input Devices Pane</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">634</int>
@@ -2000,6 +2125,7 @@
 							<reference ref="290995057"/>
 						</array>
 						<reference key="parent" ref="364857164"/>
+						<string key="objectName">Input Device List</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">636</int>
@@ -2018,6 +2144,7 @@
 							<reference ref="158646067"/>
 						</array>
 						<reference key="parent" ref="365506042"/>
+						<string key="objectName">Device/Input Name</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">642</int>
@@ -2036,8 +2163,11 @@
 							<reference ref="1016088174"/>
 							<reference ref="194275224"/>
 							<reference ref="57697638"/>
+							<reference ref="385416822"/>
+							<reference ref="792189805"/>
 						</array>
 						<reference key="parent" ref="206489479"/>
+						<string key="objectName">Output Editor Pane</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">686</int>
@@ -2058,21 +2188,25 @@
 							<reference ref="211076068"/>
 						</array>
 						<reference key="parent" ref="606740242"/>
+						<string key="objectName">Output Types</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">657</int>
 						<reference key="object" ref="177186415"/>
 						<reference key="parent" ref="120408205"/>
+						<string key="objectName">Disabled</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">658</int>
 						<reference key="object" ref="387494389"/>
 						<reference key="parent" ref="120408205"/>
+						<string key="objectName">Key Press</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">699</int>
 						<reference key="object" ref="339215895"/>
 						<reference key="parent" ref="120408205"/>
+						<string key="objectName">Switch Mapping</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">700</int>
@@ -2081,6 +2215,7 @@
 							<reference ref="74311158"/>
 						</array>
 						<reference key="parent" ref="606740242"/>
+						<string key="objectName">Mapping Choice List</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">701</int>
@@ -2103,6 +2238,7 @@
 							<reference ref="853503577"/>
 						</array>
 						<reference key="parent" ref="606740242"/>
+						<string key="objectName">Input Name</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">707</int>
@@ -2123,16 +2259,19 @@
 						<int key="objectID">733</int>
 						<reference key="object" ref="820968178"/>
 						<reference key="parent" ref="120408205"/>
+						<string key="objectName">Mouse Movement</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">734</int>
 						<reference key="object" ref="275466816"/>
 						<reference key="parent" ref="120408205"/>
+						<string key="objectName">Mouse Button</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">735</int>
 						<reference key="object" ref="134694197"/>
 						<reference key="parent" ref="120408205"/>
+						<string key="objectName">Mouse Scroll</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">659</int>
@@ -2146,6 +2285,7 @@
 							<reference ref="514491330"/>
 						</array>
 						<reference key="parent" ref="606740242"/>
+						<string key="objectName">Mouse Button Selector</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">745</int>
@@ -2156,6 +2296,7 @@
 						<int key="objectID">748</int>
 						<reference key="object" ref="211076068"/>
 						<reference key="parent" ref="120408205"/>
+						<string key="objectName">Switch Mouse Mode</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">749</int>
@@ -2164,6 +2305,7 @@
 							<reference ref="301345285"/>
 						</array>
 						<reference key="parent" ref="606740242"/>
+						<string key="objectName">Mouse Scroll Selector</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">750</int>
@@ -2177,6 +2319,7 @@
 							<reference ref="241270212"/>
 						</array>
 						<reference key="parent" ref="606740242"/>
+						<string key="objectName">Mouse Motion Selector</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">755</int>
@@ -2188,11 +2331,6 @@
 						<reference key="object" ref="57697638"/>
 						<reference key="parent" ref="606740242"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">810</int>
-						<reference key="object" ref="914355947"/>
-						<reference key="parent" ref="720053764"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">812</int>
 						<reference key="object" ref="580069611"/>
@@ -2215,6 +2353,7 @@
 							<reference ref="227597319"/>
 						</array>
 						<reference key="parent" ref="1043384830"/>
+						<string key="objectName">Mapping Selector</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">835</int>
@@ -2230,41 +2369,122 @@
 						<reference key="parent" ref="227597319"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">842</int>
-						<reference key="object" ref="981531896"/>
+						<int key="objectID">849</int>
+						<reference key="object" ref="658903347"/>
+						<reference key="parent" ref="1043384830"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">850</int>
+						<reference key="object" ref="328152383"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Popover View Controller</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">851</int>
+						<reference key="object" ref="586993839"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Mapping List Popover</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">507</int>
+						<reference key="object" ref="861276216"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="867532725"/>
+						</array>
+						<reference key="parent" ref="671181514"/>
+						<string key="objectName">Add Mapping</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">508</int>
+						<reference key="object" ref="867532725"/>
+						<reference key="parent" ref="861276216"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">862</int>
+						<reference key="object" ref="149148392"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="679083346"/>
+							<reference ref="517346822"/>
 						</array>
-						<reference key="parent" ref="1043384830"/>
+						<reference key="parent" ref="671181514"/>
+						<string key="objectName">Gradient Space</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">863</int>
+						<reference key="object" ref="517346822"/>
+						<reference key="parent" ref="149148392"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">810</int>
+						<reference key="object" ref="914355947"/>
+						<reference key="parent" ref="720053764"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">866</int>
+						<reference key="object" ref="693056251"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="997802319"/>
+						</array>
+						<reference key="parent" ref="649796088"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">840</int>
-						<reference key="object" ref="679083346"/>
+						<int key="objectID">867</int>
+						<reference key="object" ref="997802319"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="594076765"/>
+							<reference ref="842970531"/>
 						</array>
-						<reference key="parent" ref="981531896"/>
+						<reference key="parent" ref="693056251"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">841</int>
-						<reference key="object" ref="594076765"/>
-						<reference key="parent" ref="679083346"/>
+						<int key="objectID">868</int>
+						<reference key="object" ref="842970531"/>
+						<reference key="parent" ref="997802319"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">849</int>
-						<reference key="object" ref="658903347"/>
+						<int key="objectID">874</int>
+						<reference key="object" ref="985167622"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="385218002"/>
+						</array>
 						<reference key="parent" ref="1043384830"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">850</int>
-						<reference key="object" ref="328152383"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Popover View Controller</string>
+						<int key="objectID">872</int>
+						<reference key="object" ref="385218002"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="422366518"/>
+						</array>
+						<reference key="parent" ref="985167622"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">851</int>
-						<reference key="object" ref="586993839"/>
-						<reference key="parent" ref="0"/>
+						<int key="objectID">873</int>
+						<reference key="object" ref="422366518"/>
+						<reference key="parent" ref="385218002"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">883</int>
+						<reference key="object" ref="385416822"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="5417367"/>
+						</array>
+						<reference key="parent" ref="606740242"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">884</int>
+						<reference key="object" ref="5417367"/>
+						<reference key="parent" ref="385416822"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">887</int>
+						<reference key="object" ref="792189805"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="423057230"/>
+						</array>
+						<reference key="parent" ref="606740242"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">888</int>
+						<reference key="object" ref="423057230"/>
+						<reference key="parent" ref="792189805"/>
 					</object>
 				</array>
 			</object>
@@ -2286,7 +2506,6 @@
 				<string key="239.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="420.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="YES" key="450.IBNSWindowAutoPositionCentersHorizontal"/>
 				<boolean value="YES" key="450.IBNSWindowAutoPositionCentersVertical"/>
 				<string key="450.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2304,8 +2523,24 @@
 				<string key="482.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="487.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="507.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="861276216"/>
+						<string key="toolTip">Create a new mapping</string>
+					</object>
+				</object>
 				<string key="507.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="508.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="511.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="456935010"/>
+						<string key="toolTip">Remove the selected mapping</string>
+					</object>
+				</object>
 				<string key="511.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="512.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="514.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2339,14 +2574,14 @@
 				<string key="734.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="735.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="744.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="0" key="745.IBNSSegmentedControlInspectorSelectedSegmentMetadataKey"/>
+				<integer value="1" key="745.IBNSSegmentedControlInspectorSelectedSegmentMetadataKey"/>
 				<string key="745.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="748.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="749.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="0" key="750.IBNSSegmentedControlInspectorSelectedSegmentMetadataKey"/>
+				<integer value="3" key="750.IBNSSegmentedControlInspectorSelectedSegmentMetadataKey"/>
 				<string key="750.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="754.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="755.IBNSSegmentedControlInspectorSelectedSegmentMetadataKey"/>
+				<integer value="0" key="755.IBNSSegmentedControlInspectorSelectedSegmentMetadataKey"/>
 				<string key="755.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="778.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="81.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2355,24 +2590,64 @@
 				<string key="813.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="814.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="83.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="835.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="227597319"/>
+						<string key="toolTip">Change the active mapping</string>
+					</object>
+				</object>
 				<string key="835.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="836.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="837.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="837.toolbarItem.selectable"/>
-				<string key="840.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="0" key="841.IBNSSegmentedControlInspectorSelectedSegmentMetadataKey"/>
-				<string key="841.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="842.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="849.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="850.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="851.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="862.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="863.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="866.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="867.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="868.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="872.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="385218002"/>
+						<string key="toolTip">Enable mapped actions</string>
+					</object>
+				</object>
+				<string key="872.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="873.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="874.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="883.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="385416822"/>
+						<string key="toolTip">Maximum mouse speed</string>
+					</object>
+				</object>
+				<string key="883.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="884.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="887.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="792189805"/>
+						<string key="toolTip">Mouse scroll speed</string>
+					</object>
+				</object>
+				<string key="887.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="888.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="92.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">859</int>
+			<int key="maxID">891</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2380,26 +2655,16 @@
 					<string key="className">EnjoyableApplicationDelegate</string>
 					<string key="superclassName">NSObject</string>
 					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="activeMenuItem">NSMenuItem</string>
 						<string key="dockMenuBase">NSMenu</string>
-						<string key="drawer">NSDrawer</string>
 						<string key="inputController">NJDeviceController</string>
 						<string key="mappingsController">NJMappingsController</string>
-						<string key="outputController">NJOutputController</string>
+						<string key="window">NSWindow</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="activeMenuItem">
-							<string key="name">activeMenuItem</string>
-							<string key="candidateClassName">NSMenuItem</string>
-						</object>
 						<object class="IBToOneOutletInfo" key="dockMenuBase">
 							<string key="name">dockMenuBase</string>
 							<string key="candidateClassName">NSMenu</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="drawer">
-							<string key="name">drawer</string>
-							<string key="candidateClassName">NSDrawer</string>
-						</object>
 						<object class="IBToOneOutletInfo" key="inputController">
 							<string key="name">inputController</string>
 							<string key="candidateClassName">NJDeviceController</string>
@@ -2408,9 +2673,9 @@
 							<string key="name">mappingsController</string>
 							<string key="candidateClassName">NJMappingsController</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="outputController">
-							<string key="name">outputController</string>
-							<string key="candidateClassName">NJOutputController</string>
+						<object class="IBToOneOutletInfo" key="window">
+							<string key="name">window</string>
+							<string key="candidateClassName">NSWindow</string>
 						</object>
 					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -2436,7 +2701,8 @@
 						<string key="mappingsController">NJMappingsController</string>
 						<string key="outlineView">NSOutlineView</string>
 						<string key="outputController">NJOutputController</string>
-						<string key="translatingEventsSetting">NSSegmentedControl</string>
+						<string key="translatingEventsButton">NSButton</string>
+						<string key="translatingEventsMenu">NSMenuItem</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
 						<object class="IBToOneOutletInfo" key="mappingsController">
@@ -2451,9 +2717,13 @@
 							<string key="name">outputController</string>
 							<string key="candidateClassName">NJOutputController</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="translatingEventsSetting">
-							<string key="name">translatingEventsSetting</string>
-							<string key="candidateClassName">NSSegmentedControl</string>
+						<object class="IBToOneOutletInfo" key="translatingEventsButton">
+							<string key="name">translatingEventsButton</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="translatingEventsMenu">
+							<string key="name">translatingEventsMenu</string>
+							<string key="candidateClassName">NSMenuItem</string>
 						</object>
 					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -2552,7 +2822,9 @@
 					<dictionary class="NSMutableDictionary" key="actions">
 						<string key="mbtnChanged:">id</string>
 						<string key="mdirChanged:">id</string>
+						<string key="mouseSpeedChanged:">id</string>
 						<string key="radioChanged:">id</string>
+						<string key="scrollSpeedChanged:">id</string>
 						<string key="sdirChanged:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
@@ -2564,10 +2836,18 @@
 							<string key="name">mdirChanged:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="mouseSpeedChanged:">
+							<string key="name">mouseSpeedChanged:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 						<object class="IBActionInfo" key="radioChanged:">
 							<string key="name">radioChanged:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="scrollSpeedChanged:">
+							<string key="name">scrollSpeedChanged:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 						<object class="IBActionInfo" key="sdirChanged:">
 							<string key="name">sdirChanged:</string>
 							<string key="candidateClassName">id</string>
@@ -2580,8 +2860,10 @@
 						<string key="mappingsController">NJMappingsController</string>
 						<string key="mouseBtnSelect">NSSegmentedControl</string>
 						<string key="mouseDirSelect">NSSegmentedControl</string>
+						<string key="mouseSpeedSlider">NSSlider</string>
 						<string key="radioButtons">NSMatrix</string>
 						<string key="scrollDirSelect">NSSegmentedControl</string>
+						<string key="scrollSpeedSlider">NSSlider</string>
 						<string key="title">NSTextField</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -2609,6 +2891,10 @@
 							<string key="name">mouseDirSelect</string>
 							<string key="candidateClassName">NSSegmentedControl</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="mouseSpeedSlider">
+							<string key="name">mouseSpeedSlider</string>
+							<string key="candidateClassName">NSSlider</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="radioButtons">
 							<string key="name">radioButtons</string>
 							<string key="candidateClassName">NSMatrix</string>
@@ -2617,6 +2903,10 @@
 							<string key="name">scrollDirSelect</string>
 							<string key="candidateClassName">NSSegmentedControl</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="scrollSpeedSlider">
+							<string key="name">scrollSpeedSlider</string>
+							<string key="candidateClassName">NSSlider</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="title">
 							<string key="name">title</string>
 							<string key="candidateClassName">NSTextField</string>
@@ -2634,14 +2924,13 @@
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="NSActionTemplate">{15, 15}</string>
 			<string key="NSAddTemplate">{8, 8}</string>
 			<string key="NSListViewTemplate">{11, 10}</string>
 			<string key="NSMenuCheckmark">{11, 11}</string>
 			<string key="NSMenuMixedState">{10, 3}</string>
-			<string key="NSPathTemplate">{13, 10}</string>
 			<string key="NSRadioButton">{16, 15}</string>
 			<string key="NSRemoveTemplate">{8, 8}</string>
+			<string key="NSRightFacingTriangleTemplate">{9, 9}</string>
 		</dictionary>
 	</data>
 </archive>