From a30ca9e35091544a740e01661838f72b5314b5b8 Mon Sep 17 00:00:00 2001
From: rogerman <rogerman@users.sf.net>
Date: Fri, 7 Aug 2015 19:37:53 +0000
Subject: [PATCH] Cocoa Port: - Expose stylus pressure and stylus jitter
 settings in Emulation > Show Stylus Settings.

---
 desmume/src/cocoa/DefaultUserPrefs.plist      |    4 +
 desmume/src/cocoa/cocoa_input.h               |   19 +-
 desmume/src/cocoa/cocoa_input.mm              |    9 +-
 .../English.lproj/MainMenu.strings            |  Bin 342318 -> 349944 bytes
 .../translations/English.lproj/MainMenu.xib   | 1175 +++++++++++++++--
 .../userinterface/EmuControllerDelegate.h     |    1 +
 .../userinterface/EmuControllerDelegate.mm    |   13 +
 7 files changed, 1099 insertions(+), 122 deletions(-)

diff --git a/desmume/src/cocoa/DefaultUserPrefs.plist b/desmume/src/cocoa/DefaultUserPrefs.plist
index 6de956719..9c0a0db5b 100644
--- a/desmume/src/cocoa/DefaultUserPrefs.plist
+++ b/desmume/src/cocoa/DefaultUserPrefs.plist
@@ -64,6 +64,10 @@
 	<integer>12</integer>
 	<key>Emulation_RigorousTiming</key>
 	<false/>
+	<key>Emulation_StylusPressure</key>
+	<integer>50</integer>
+	<key>Emulation_StylusEnableJitter</key>
+	<false/>
 	<key>Emulation_UseDebugConsole</key>
 	<false/>
 	<key>Emulation_UseExternalBIOSImages</key>
diff --git a/desmume/src/cocoa/cocoa_input.h b/desmume/src/cocoa/cocoa_input.h
index 5021d1528..8a8652277 100644
--- a/desmume/src/cocoa/cocoa_input.h
+++ b/desmume/src/cocoa/cocoa_input.h
@@ -91,21 +91,26 @@ typedef struct
 @interface CocoaDSController : NSObject
 {
 	id <CocoaDSControllerDelegate> delegate;
-	float micLevel;
+	
+	NDSInput ndsInput[DSControllerState_StatesCount];
 	BOOL autohold;
-	BOOL hardwareMicMute;
 	BOOL _isAutoholdCleared;
+	
+	NSPoint touchLocation;
+	NSInteger paddleAdjust;
+	NSInteger stylusPressure;
+	BOOL stylusEnableJitter;
+	
+	float micLevel;
+	BOOL hardwareMicMute;
 	BOOL _useHardwareMic;
 	size_t _availableMicSamples;
 	std::vector<uint8_t> *_hwMicLevelList;
 	NSInteger micMode;
-	NSPoint touchLocation;
 	
-	NDSInput ndsInput[DSControllerState_StatesCount];
 	AudioSampleBlockGenerator *selectedAudioFileGenerator;
 	CoreAudioInput *CAInputDevice;
 	AudioGenerator *softwareMicSampleGenerator;
-	NSInteger paddleAdjust;
 	
 	NSString *hardwareMicInfoString;
 	NSString *hardwareMicNameString;
@@ -117,6 +122,9 @@ typedef struct
 
 @property (retain) id <CocoaDSControllerDelegate> delegate;
 @property (assign) BOOL autohold;
+@property (assign) NSInteger paddleAdjust;
+@property (assign) NSInteger stylusPressure;
+@property (assign) BOOL stylusEnableJitter;
 @property (readonly) BOOL isHardwareMicAvailable;
 @property (readonly) BOOL isHardwareMicIdle;
 @property (readonly) BOOL isHardwareMicInClip;
@@ -132,7 +140,6 @@ typedef struct
 @property (readonly) CoreAudioInput *CAInputDevice;
 @property (readonly) AudioGenerator *softwareMicSampleGenerator;
 @property (assign) AudioSampleBlockGenerator *selectedAudioFileGenerator;
-@property (assign) NSInteger paddleAdjust;
 @property (retain) NSString *hardwareMicInfoString;
 @property (retain) NSString *hardwareMicNameString;
 @property (retain) NSString *hardwareMicManufacturerString;
diff --git a/desmume/src/cocoa/cocoa_input.mm b/desmume/src/cocoa/cocoa_input.mm
index 89548d02a..895eb7edf 100644
--- a/desmume/src/cocoa/cocoa_input.mm
+++ b/desmume/src/cocoa/cocoa_input.mm
@@ -35,6 +35,10 @@ SineWaveGenerator sineWaveGenerator(250.0, MIC_SAMPLE_RATE);
 @implementation CocoaDSController
 
 @synthesize delegate;
+@dynamic autohold;
+@synthesize paddleAdjust;
+@synthesize stylusPressure;
+@synthesize stylusEnableJitter;
 @dynamic isHardwareMicAvailable;
 @dynamic isHardwareMicIdle;
 @dynamic isHardwareMicInClip;
@@ -46,12 +50,10 @@ SineWaveGenerator sineWaveGenerator(250.0, MIC_SAMPLE_RATE);
 @dynamic hardwareMicPause;
 @dynamic softwareMicState;
 @dynamic softwareMicMode;
-@dynamic autohold;
 @synthesize micMode;
 @synthesize CAInputDevice;
 @synthesize softwareMicSampleGenerator;
 @synthesize selectedAudioFileGenerator;
-@synthesize paddleAdjust;
 @synthesize hardwareMicInfoString;
 @synthesize hardwareMicNameString;
 @synthesize hardwareMicManufacturerString;
@@ -343,6 +345,9 @@ SineWaveGenerator sineWaveGenerator(250.0, MIC_SAMPLE_RATE);
 			   flushedStates[DSControllerState_Lid]);
 	
 	// Setup the DS touch pad.
+	CommonSettings.StylusPressure = (int)[self stylusPressure];
+	CommonSettings.StylusJitter = ([self stylusEnableJitter]) ? true : false;
+	
 	if (isTouchDown)
 	{
 		NDS_setTouchPos((u16)theLocation.x, (u16)theLocation.y);
diff --git a/desmume/src/cocoa/translations/English.lproj/MainMenu.strings b/desmume/src/cocoa/translations/English.lproj/MainMenu.strings
index 3b88fb4281a5f0e6369e4be2b9053059eca4b506..b5170efba642af60f27f8e3d1c3b85d10a055e1c 100644
GIT binary patch
delta 3115
zcmeHJU2GIp6h8OPY>~AK47=5~Tj~^cYEaYcu3EP(v0Y4jAf&;i*8j-%N4mIO+TB@k
zODwC|KKMecS2;cyLrL@j3!%W9(PCdUrZpj<FGiy#n3y006BB>Wy)*4DSffe93zAJ{
z?w$G0ckiA#-*?Z+D}i55)D%ms#7kO9KkI2}!{4H;5s!AV=Cw8yAPsrQiK)YP;-2U9
zdJMOCszhQ#;7A+YLxoxlzpLwOTo@*wXOD>aZ`<+W_iQtEr*$trZLw-=1O_1sDcBDK
zbnOQdk~G>UslkR}dYb_ojq}`(4VQTJp)?`;31h364B_{~3v{(%h_I%La@U0W)I3Ej
zdD^TKlYzbTbcmh|(-Rp#r0xSW+DDu={p5~XXug}c<qk}WNvct<mL@W=K=&-Y8YQBX
z9APA_Z}Q3ACZUg38-xKgYMEc`{3L*_zw?bo55$Sl3F{~3ES^YdL9G6j*W<+t+*Ap~
zxyQAQV!l`RgyDXO;pK5XA|9T-?N-`kwy#fH`&T@HT|emS{JZJ1Eq!(qcE}Hj#uwaj
zs`ASx?qFdNKN!SQ1g=>DOz_Dm_6%lDYgKD<R7H8niqY;ZPJDJ+eG?YOnJ^2AqOXiu
z=-!IwUS`qTD@aKbRILRTa-zQ;58zKxkB*7;tR8oDvg&K(qo7_ab}|#sjj=H&Xzrt>
zC0RS$gd+!80uMjSw)x@}^2mv%_xwJ!SyiSa1$^}?uklwVBM&1~Z5cE!@hyj>Bn~L4
z$b6a*28*sK`om=jrD?vGFj5FogeDP4w3`+cC#54L6Cs9`IHVYp@Dedy!{IHH;LIYw
zt4>N;im*?yO3@FJoJp?e%dz14Ay<KYY6Ax_`7ys&<p&3XOeIJQLo3D;Eb{+OOvfyb
zh_2opS{^K9i&~SDrPDdS<R-1;CPt$t!YusM@;rsdZK^lv*?8<{$8xB=7xFxaf7t9v
zG(XU&U?(&e!&6SW31fUt>}Mymka**rD0>hen{ZbXeZx+nvxme?s1A#t5d{I8Mc45L
z94YYS)8OsPyu&H;Y|#l3b3F|es+gI6<<0NBt2Di>|M{%I$=6xki#Oo7pvu0Hr-k6J
zxfzd%rm2Y7HhU{)l=6Q#Dw<bspcbC|kOyuW7Zuz8Tr$xZF8rvi&O~pH<VYvQU3Yt8
z*fXIuDwkq0@y)p3Im6%DK<(Pm3tH8R7Ko)u$8f3L7`1}S78p9x%OAjLo7!h(xmS%c
z?7VW^N5!7rd#-cu?PJSlTpNzAV-fXUx%Y~F3MS5!1BAir{?@6?zt7tLrB{kBx{Zg3
X3#VT)D_R>;mujxuE_pL_fEWG(1!(Z<

delta 19
acmeydR&?Dbk%kt=7N!>F7M3lndX@lI`Ufch

diff --git a/desmume/src/cocoa/translations/English.lproj/MainMenu.xib b/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
index f648350fe..3f801579b 100644
--- a/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
+++ b/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
@@ -769,6 +769,14 @@
 									<reference key="NSOnImage" ref="396634170"/>
 									<reference key="NSMixedImage" ref="678976864"/>
 								</object>
+								<object class="NSMenuItem" id="170447076">
+									<reference key="NSMenu" ref="597556522"/>
+									<string key="NSTitle">Show Stylus Settings...</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="396634170"/>
+									<reference key="NSMixedImage" ref="678976864"/>
+								</object>
 								<object class="NSMenuItem" id="375211383">
 									<reference key="NSMenu" ref="597556522"/>
 									<bool key="NSIsDisabled">YES</bool>
@@ -3756,7 +3764,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
 						</set>
 						<string key="NSFrame">{{13, 10}, {463, 412}}</string>
 						<reference key="NSSuperview" ref="373257179"/>
-						<reference key="NSNextKeyView" ref="698863500"/>
 						<array class="NSMutableArray" key="NSTabViewItems">
 							<object class="NSTabViewItem" id="750316744">
 								<string key="NSIdentifier">1</string>
@@ -6456,7 +6463,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 						<set class="NSMutableSet" key="NSDragTypes">
 							<string>public.item</string>
 						</set>
-						<string key="NSFrame">{{13, 10}, {528, 388}}</string>
+						<string key="NSFrame">{{13, 10}, {528, 423}}</string>
 						<reference key="NSSuperview" ref="748902585"/>
 						<reference key="NSNextKeyView" ref="461624007"/>
 						<array class="NSMutableArray" key="NSTabViewItems">
@@ -6528,7 +6535,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 													<reference key="NSNextKeyView" ref="621197304"/>
 												</object>
 											</array>
-											<string key="NSFrame">{{6, 248}, {496, 74}}</string>
+											<string key="NSFrame">{{6, 303}, {496, 74}}</string>
 											<reference key="NSSuperview" ref="461624007"/>
 											<reference key="NSNextKeyView" ref="330186328"/>
 											<string key="NSOffsets">{0, 0}</string>
@@ -6880,7 +6887,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 															<int key="NSvFlags">268</int>
 															<string key="NSFrame">{{371, 10}, {19, 27}}</string>
 															<reference key="NSSuperview" ref="16233"/>
-															<reference key="NSNextKeyView" ref="337932383"/>
+															<reference key="NSNextKeyView" ref="704971554"/>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSStepperCell" key="NSCell" id="401365162">
 																<int key="NSCellFlags">67895328</int>
@@ -6901,7 +6908,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 													<reference key="NSNextKeyView" ref="1002748640"/>
 												</object>
 											</array>
-											<string key="NSFrame">{{6, 166}, {496, 78}}</string>
+											<string key="NSFrame">{{6, 221}, {496, 78}}</string>
 											<reference key="NSSuperview" ref="461624007"/>
 											<reference key="NSNextKeyView" ref="16233"/>
 											<string key="NSOffsets">{0, 0}</string>
@@ -6919,6 +6926,294 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 											<int key="NSTitlePosition">2</int>
 											<bool key="NSTransparent">NO</bool>
 										</object>
+										<object class="NSBox" id="704971554">
+											<reference key="NSNextResponder" ref="461624007"/>
+											<int key="NSvFlags">12</int>
+											<array class="NSMutableArray" key="NSSubviews">
+												<object class="NSView" id="987276464">
+													<reference key="NSNextResponder" ref="704971554"/>
+													<int key="NSvFlags">274</int>
+													<array class="NSMutableArray" key="NSSubviews">
+														<object class="NSButton" id="773356702">
+															<reference key="NSNextResponder" ref="987276464"/>
+															<int key="NSvFlags">268</int>
+															<string key="NSFrame">{{337, 17}, {141, 18}}</string>
+															<reference key="NSSuperview" ref="987276464"/>
+															<reference key="NSNextKeyView" ref="808054783"/>
+															<string key="NSReuseIdentifierKey">_NS:9</string>
+															<bool key="NSEnabled">YES</bool>
+															<object class="NSButtonCell" key="NSCell" id="505084566">
+																<int key="NSCellFlags">67108864</int>
+																<int key="NSCellFlags2">268435456</int>
+																<string key="NSContents">Enable Stylus Jitter</string>
+																<reference key="NSSupport" ref="462791774"/>
+																<string key="NSCellIdentifier">_NS:9</string>
+																<reference key="NSControlView" ref="773356702"/>
+																<int key="NSButtonFlags">1211912448</int>
+																<int key="NSButtonFlags2">2</int>
+																<reference key="NSNormalImage" ref="254121778"/>
+																<reference key="NSAlternateImage" ref="1000893652"/>
+																<string key="NSAlternateContents"/>
+																<string key="NSKeyEquivalent"/>
+																<int key="NSPeriodicDelay">200</int>
+																<int key="NSPeriodicInterval">25</int>
+															</object>
+															<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+														</object>
+														<object class="NSTextField" id="90098197">
+															<reference key="NSNextResponder" ref="987276464"/>
+															<int key="NSvFlags">268</int>
+															<string key="NSFrame">{{16, 14}, {66, 17}}</string>
+															<reference key="NSSuperview" ref="987276464"/>
+															<reference key="NSNextKeyView" ref="239207266"/>
+															<string key="NSReuseIdentifierKey">_NS:526</string>
+															<string key="NSHuggingPriority">{251, 750}</string>
+															<bool key="NSEnabled">YES</bool>
+															<object class="NSTextFieldCell" key="NSCell" id="925694308">
+																<int key="NSCellFlags">68157504</int>
+																<int key="NSCellFlags2">272630784</int>
+																<string key="NSContents">Pressure:</string>
+																<reference key="NSSupport" ref="462791774"/>
+																<string key="NSCellIdentifier">_NS:526</string>
+																<reference key="NSControlView" ref="90098197"/>
+																<reference key="NSBackgroundColor" ref="266180242"/>
+																<reference key="NSTextColor" ref="353533534"/>
+															</object>
+															<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+															<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+														</object>
+														<object class="NSSlider" id="239207266">
+															<reference key="NSNextResponder" ref="987276464"/>
+															<int key="NSvFlags">268</int>
+															<string key="NSFrame">{{86, 12}, {176, 26}}</string>
+															<reference key="NSSuperview" ref="987276464"/>
+															<reference key="NSNextKeyView" ref="642300079"/>
+															<string key="NSReuseIdentifierKey">_NS:9</string>
+															<bool key="NSEnabled">YES</bool>
+															<object class="NSSliderCell" key="NSCell" id="660652407">
+																<int key="NSCellFlags">-2080112384</int>
+																<int key="NSCellFlags2">0</int>
+																<string key="NSContents"/>
+																<string key="NSCellIdentifier">_NS:9</string>
+																<reference key="NSControlView" ref="239207266"/>
+																<double key="NSMaxValue">100</double>
+																<double key="NSMinValue">0.0</double>
+																<double key="NSValue">50</double>
+																<double key="NSAltIncValue">0.0</double>
+																<int key="NSNumberOfTickMarks">11</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="NSTextField" id="642300079">
+															<reference key="NSNextResponder" ref="987276464"/>
+															<int key="NSvFlags">268</int>
+															<string key="NSFrame">{{266, 14}, {52, 17}}</string>
+															<reference key="NSSuperview" ref="987276464"/>
+															<reference key="NSNextKeyView" ref="773356702"/>
+															<string key="NSReuseIdentifierKey">_NS:526</string>
+															<string key="NSHuggingPriority">{251, 750}</string>
+															<bool key="NSEnabled">YES</bool>
+															<object class="NSTextFieldCell" key="NSCell" id="308235019">
+																<int key="NSCellFlags">68157504</int>
+																<int key="NSCellFlags2">272630784</int>
+																<reference key="NSSupport" ref="462791774"/>
+																<object class="NSNumberFormatter" key="NSFormatter" id="981244020">
+																	<dictionary class="NSMutableDictionary" key="NS.attributes">
+																		<boolean value="NO" key="allowsFloats"/>
+																		<integer value="1040" key="formatterBehavior"/>
+																		<reference key="locale" ref="78706403"/>
+																		<string key="negativeInfinitySymbol">-∞</string>
+																		<string key="negativeSuffix">%</string>
+																		<string key="nilSymbol"/>
+																		<string key="positiveInfinitySymbol">+∞</string>
+																		<string key="positiveSuffix">%</string>
+																	</dictionary>
+																	<string key="NS.positiveformat">#'%'</string>
+																	<string key="NS.negativeformat">#'%'</string>
+																	<nil key="NS.positiveattrs"/>
+																	<nil key="NS.negativeattrs"/>
+																	<nil key="NS.zero"/>
+																	<object class="NSAttributedString" key="NS.nil">
+																		<string key="NSString"/>
+																	</object>
+																	<object class="NSAttributedString" key="NS.nan">
+																		<string key="NSString">NaN</string>
+																		<reference key="NSAttributes" ref="292804101"/>
+																	</object>
+																	<reference key="NS.min" ref="722528714"/>
+																	<reference key="NS.max" ref="722528714"/>
+																	<object class="NSDecimalNumberHandler" key="NS.rounding">
+																		<int key="NS.roundingmode">3</int>
+																		<bool key="NS.raise.overflow">YES</bool>
+																		<bool key="NS.raise.underflow">YES</bool>
+																		<bool key="NS.raise.dividebyzero">YES</bool>
+																	</object>
+																	<string key="NS.decimal">.</string>
+																	<string key="NS.thousand">,</string>
+																	<bool key="NS.hasthousands">NO</bool>
+																	<bool key="NS.localized">NO</bool>
+																	<bool key="NS.allowsfloats">NO</bool>
+																</object>
+																<string key="NSPlaceholderString">u%%</string>
+																<string key="NSCellIdentifier">_NS:526</string>
+																<reference key="NSControlView" ref="642300079"/>
+																<reference key="NSBackgroundColor" ref="266180242"/>
+																<reference key="NSTextColor" ref="353533534"/>
+															</object>
+															<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+															<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+														</object>
+														<object class="NSTextField" id="765549650">
+															<reference key="NSNextResponder" ref="987276464"/>
+															<int key="NSvFlags">268</int>
+															<string key="NSFrame">{{83, 36}, {26, 14}}</string>
+															<reference key="NSSuperview" ref="987276464"/>
+															<reference key="NSNextKeyView" ref="943830921"/>
+															<string key="NSReuseIdentifierKey">_NS:526</string>
+															<string key="NSHuggingPriority">{251, 750}</string>
+															<bool key="NSEnabled">YES</bool>
+															<object class="NSTextFieldCell" key="NSCell" id="1059052938">
+																<int key="NSCellFlags">68157504</int>
+																<int key="NSCellFlags2">138544128</int>
+																<string key="NSContents">0</string>
+																<reference key="NSSupport" ref="26"/>
+																<string key="NSCellIdentifier">_NS:526</string>
+																<reference key="NSControlView" ref="765549650"/>
+																<reference key="NSBackgroundColor" ref="266180242"/>
+																<reference key="NSTextColor" ref="353533534"/>
+															</object>
+															<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+															<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+														</object>
+														<object class="NSTextField" id="943830921">
+															<reference key="NSNextResponder" ref="987276464"/>
+															<int key="NSvFlags">268</int>
+															<string key="NSFrame">{{161, 36}, {26, 14}}</string>
+															<reference key="NSSuperview" ref="987276464"/>
+															<reference key="NSNextKeyView" ref="636105289"/>
+															<string key="NSReuseIdentifierKey">_NS:526</string>
+															<string key="NSHuggingPriority">{251, 750}</string>
+															<bool key="NSEnabled">YES</bool>
+															<object class="NSTextFieldCell" key="NSCell" id="30018622">
+																<int key="NSCellFlags">68157504</int>
+																<int key="NSCellFlags2">138544128</int>
+																<string key="NSContents">50</string>
+																<reference key="NSSupport" ref="26"/>
+																<string key="NSCellIdentifier">_NS:526</string>
+																<reference key="NSControlView" ref="943830921"/>
+																<reference key="NSBackgroundColor" ref="266180242"/>
+																<reference key="NSTextColor" ref="353533534"/>
+															</object>
+															<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+															<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+														</object>
+														<object class="NSTextField" id="636105289">
+															<reference key="NSNextResponder" ref="987276464"/>
+															<int key="NSvFlags">268</int>
+															<string key="NSFrame">{{236, 36}, {31, 14}}</string>
+															<reference key="NSSuperview" ref="987276464"/>
+															<reference key="NSNextKeyView" ref="90098197"/>
+															<string key="NSReuseIdentifierKey">_NS:526</string>
+															<string key="NSHuggingPriority">{251, 750}</string>
+															<bool key="NSEnabled">YES</bool>
+															<object class="NSTextFieldCell" key="NSCell" id="665264944">
+																<int key="NSCellFlags">68157504</int>
+																<int key="NSCellFlags2">138544128</int>
+																<string key="NSContents">100</string>
+																<reference key="NSSupport" ref="26"/>
+																<string key="NSCellIdentifier">_NS:526</string>
+																<reference key="NSControlView" ref="636105289"/>
+																<reference key="NSBackgroundColor" ref="266180242"/>
+																<reference key="NSTextColor" ref="353533534"/>
+															</object>
+															<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+															<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+														</object>
+													</array>
+													<string key="NSFrame">{{1, 1}, {494, 60}}</string>
+													<reference key="NSSuperview" ref="704971554"/>
+													<reference key="NSNextKeyView" ref="765549650"/>
+													<string key="NSReuseIdentifierKey">_NS:11</string>
+												</object>
+											</array>
+											<string key="NSFrame">{{6, 141}, {496, 76}}</string>
+											<reference key="NSSuperview" ref="461624007"/>
+											<reference key="NSNextKeyView" ref="987276464"/>
+											<string key="NSReuseIdentifierKey">_NS:9</string>
+											<string key="NSOffsets">{0, 0}</string>
+											<object class="NSTextFieldCell" key="NSTitleCell">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">0</int>
+												<string key="NSContents">Stylus Configuration</string>
+												<reference key="NSSupport" ref="26"/>
+												<reference key="NSBackgroundColor" ref="527409595"/>
+												<reference key="NSTextColor" ref="353533534"/>
+											</object>
+											<reference key="NSContentView" ref="987276464"/>
+											<int key="NSBorderType">1</int>
+											<int key="NSBoxType">0</int>
+											<int key="NSTitlePosition">2</int>
+											<bool key="NSTransparent">NO</bool>
+										</object>
+										<object class="NSBox" id="808054783">
+											<reference key="NSNextResponder" ref="461624007"/>
+											<int key="NSvFlags">12</int>
+											<array class="NSMutableArray" key="NSSubviews">
+												<object class="NSView" id="675831467">
+													<reference key="NSNextResponder" ref="808054783"/>
+													<int key="NSvFlags">274</int>
+													<array class="NSMutableArray" key="NSSubviews">
+														<object class="NSButton" id="361866954">
+															<reference key="NSNextResponder" ref="675831467"/>
+															<int key="NSvFlags">268</int>
+															<string key="NSFrame">{{16, 12}, {462, 18}}</string>
+															<reference key="NSSuperview" ref="675831467"/>
+															<reference key="NSNextKeyView" ref="337932383"/>
+															<bool key="NSEnabled">YES</bool>
+															<object class="NSButtonCell" key="NSCell" id="830122320">
+																<int key="NSCellFlags">-2080374784</int>
+																<int key="NSCellFlags2">0</int>
+																<string key="NSContents">Use ADVANsCEne Database when auto-detecting the ROM save type</string>
+																<reference key="NSSupport" ref="462791774"/>
+																<reference key="NSControlView" ref="361866954"/>
+																<int key="NSButtonFlags">1211912448</int>
+																<int key="NSButtonFlags2">2</int>
+																<reference key="NSNormalImage" ref="254121778"/>
+																<reference key="NSAlternateImage" ref="1000893652"/>
+																<string key="NSAlternateContents"/>
+																<string key="NSKeyEquivalent"/>
+																<int key="NSPeriodicDelay">200</int>
+																<int key="NSPeriodicInterval">25</int>
+															</object>
+															<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+														</object>
+													</array>
+													<string key="NSFrame">{{1, 1}, {494, 38}}</string>
+													<reference key="NSSuperview" ref="808054783"/>
+													<reference key="NSNextKeyView" ref="361866954"/>
+												</object>
+											</array>
+											<string key="NSFrame">{{6, 83}, {496, 54}}</string>
+											<reference key="NSSuperview" ref="461624007"/>
+											<reference key="NSNextKeyView" ref="675831467"/>
+											<string key="NSOffsets">{0, 0}</string>
+											<object class="NSTextFieldCell" key="NSTitleCell">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">0</int>
+												<string key="NSContents">ROM Save Configuration</string>
+												<reference key="NSSupport" ref="26"/>
+												<reference key="NSBackgroundColor" ref="527409595"/>
+												<reference key="NSTextColor" ref="353533534"/>
+											</object>
+											<reference key="NSContentView" ref="675831467"/>
+											<int key="NSBorderType">1</int>
+											<int key="NSBoxType">0</int>
+											<int key="NSTitlePosition">2</int>
+											<bool key="NSTransparent">NO</bool>
+										</object>
 										<object class="NSBox" id="337932383">
 											<reference key="NSNextResponder" ref="461624007"/>
 											<int key="NSvFlags">12</int>
@@ -6956,7 +7251,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 															<int key="NSvFlags">268</int>
 															<string key="NSFrame">{{16, 12}, {118, 18}}</string>
 															<reference key="NSSuperview" ref="808083999"/>
-															<reference key="NSNextKeyView" ref="808054783"/>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSButtonCell" key="NSCell" id="16571944">
 																<int key="NSCellFlags">67108864</int>
@@ -6981,7 +7275,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 													<reference key="NSNextKeyView" ref="396299062"/>
 												</object>
 											</array>
-											<string key="NSFrame">{{6, 88}, {496, 74}}</string>
+											<string key="NSFrame">{{6, 5}, {496, 74}}</string>
 											<reference key="NSSuperview" ref="461624007"/>
 											<reference key="NSNextKeyView" ref="808083999"/>
 											<string key="NSOffsets">{0, 0}</string>
@@ -6999,64 +7293,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 											<int key="NSTitlePosition">2</int>
 											<bool key="NSTransparent">NO</bool>
 										</object>
-										<object class="NSBox" id="808054783">
-											<reference key="NSNextResponder" ref="461624007"/>
-											<int key="NSvFlags">12</int>
-											<array class="NSMutableArray" key="NSSubviews">
-												<object class="NSView" id="675831467">
-													<reference key="NSNextResponder" ref="808054783"/>
-													<int key="NSvFlags">274</int>
-													<array class="NSMutableArray" key="NSSubviews">
-														<object class="NSButton" id="361866954">
-															<reference key="NSNextResponder" ref="675831467"/>
-															<int key="NSvFlags">268</int>
-															<string key="NSFrame">{{16, 12}, {462, 18}}</string>
-															<reference key="NSSuperview" ref="675831467"/>
-															<reference key="NSNextKeyView" ref="626099"/>
-															<bool key="NSEnabled">YES</bool>
-															<object class="NSButtonCell" key="NSCell" id="830122320">
-																<int key="NSCellFlags">-2080374784</int>
-																<int key="NSCellFlags2">0</int>
-																<string key="NSContents">Use ADVANsCEne Database when auto-detecting the ROM save type</string>
-																<reference key="NSSupport" ref="462791774"/>
-																<reference key="NSControlView" ref="361866954"/>
-																<int key="NSButtonFlags">1211912448</int>
-																<int key="NSButtonFlags2">2</int>
-																<reference key="NSNormalImage" ref="254121778"/>
-																<reference key="NSAlternateImage" ref="1000893652"/>
-																<string key="NSAlternateContents"/>
-																<string key="NSKeyEquivalent"/>
-																<int key="NSPeriodicDelay">200</int>
-																<int key="NSPeriodicInterval">25</int>
-															</object>
-															<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-														</object>
-													</array>
-													<string key="NSFrame">{{1, 1}, {494, 38}}</string>
-													<reference key="NSSuperview" ref="808054783"/>
-													<reference key="NSNextKeyView" ref="361866954"/>
-												</object>
-											</array>
-											<string key="NSFrame">{{6, 30}, {496, 54}}</string>
-											<reference key="NSSuperview" ref="461624007"/>
-											<reference key="NSNextKeyView" ref="675831467"/>
-											<string key="NSOffsets">{0, 0}</string>
-											<object class="NSTextFieldCell" key="NSTitleCell">
-												<int key="NSCellFlags">67108864</int>
-												<int key="NSCellFlags2">0</int>
-												<string key="NSContents">ROM Save Configuration</string>
-												<reference key="NSSupport" ref="26"/>
-												<reference key="NSBackgroundColor" ref="527409595"/>
-												<reference key="NSTextColor" ref="353533534"/>
-											</object>
-											<reference key="NSContentView" ref="675831467"/>
-											<int key="NSBorderType">1</int>
-											<int key="NSBoxType">0</int>
-											<int key="NSTitlePosition">2</int>
-											<bool key="NSTransparent">NO</bool>
-										</object>
 									</array>
-									<string key="NSFrame">{{10, 33}, {508, 342}}</string>
+									<string key="NSFrame">{{10, 33}, {508, 377}}</string>
 									<reference key="NSSuperview" ref="626099"/>
 									<reference key="NSNextKeyView" ref="699930286"/>
 								</object>
@@ -7280,7 +7518,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 													<reference key="NSNextKeyView" ref="831804804"/>
 												</object>
 											</array>
-											<string key="NSFrame">{{6, 166}, {496, 159}}</string>
+											<string key="NSFrame">{{6, 198}, {496, 159}}</string>
 											<reference key="NSSuperview" ref="978355863"/>
 											<reference key="NSNextKeyView" ref="583474551"/>
 											<string key="NSOffsets">{0, 0}</string>
@@ -7444,7 +7682,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 													<reference key="NSNextKeyView" ref="734358422"/>
 												</object>
 											</array>
-											<string key="NSFrame">{{6, 27}, {496, 135}}</string>
+											<string key="NSFrame">{{6, 59}, {496, 135}}</string>
 											<reference key="NSSuperview" ref="978355863"/>
 											<reference key="NSNextKeyView" ref="400774933"/>
 											<string key="NSOffsets">{0, 0}</string>
@@ -7463,7 +7701,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 											<bool key="NSTransparent">NO</bool>
 										</object>
 									</array>
-									<string key="NSFrame">{{10, 33}, {508, 342}}</string>
+									<string key="NSFrame">{{10, 33}, {508, 374}}</string>
 									<reference key="NSNextKeyView" ref="1013462952"/>
 								</object>
 								<string key="NSLabel">BIOS and Firmware</string>
@@ -7813,7 +8051,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 													<reference key="NSNextKeyView" ref="692844345"/>
 												</object>
 											</array>
-											<string key="NSFrame">{{101, 63}, {312, 153}}</string>
+											<string key="NSFrame">{{101, 95}, {312, 153}}</string>
 											<reference key="NSSuperview" ref="926005793"/>
 											<reference key="NSNextKeyView" ref="54069071"/>
 											<string key="NSOffsets">{0, 0}</string>
@@ -7834,7 +8072,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 										<object class="NSPopUpButton" id="552851483">
 											<reference key="NSNextResponder" ref="926005793"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{244, 315}, {169, 26}}</string>
+											<string key="NSFrame">{{244, 347}, {169, 26}}</string>
 											<reference key="NSSuperview" ref="926005793"/>
 											<reference key="NSNextKeyView" ref="487826591"/>
 											<bool key="NSEnabled">YES</bool>
@@ -7901,7 +8139,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 										<object class="NSTextField" id="890740037">
 											<reference key="NSNextResponder" ref="926005793"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{74, 321}, {168, 17}}</string>
+											<string key="NSFrame">{{74, 353}, {168, 17}}</string>
 											<reference key="NSSuperview" ref="926005793"/>
 											<reference key="NSNextKeyView" ref="552851483"/>
 											<bool key="NSEnabled">YES</bool>
@@ -8003,7 +8241,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 													<reference key="NSNextKeyView" ref="13611839"/>
 												</object>
 											</array>
-											<string key="NSFrame">{{101, 220}, {312, 93}}</string>
+											<string key="NSFrame">{{101, 252}, {312, 93}}</string>
 											<reference key="NSSuperview" ref="926005793"/>
 											<reference key="NSNextKeyView" ref="923448282"/>
 											<string key="NSOffsets">{0, 0}</string>
@@ -8059,7 +8297,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 													<reference key="NSNextKeyView" ref="408650936"/>
 												</object>
 											</array>
-											<string key="NSFrame">{{101, 5}, {312, 54}}</string>
+											<string key="NSFrame">{{101, 37}, {312, 54}}</string>
 											<reference key="NSSuperview" ref="926005793"/>
 											<reference key="NSNextKeyView" ref="817768364"/>
 											<string key="NSOffsets">{0, 0}</string>
@@ -8078,7 +8316,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 											<bool key="NSTransparent">NO</bool>
 										</object>
 									</array>
-									<string key="NSFrame">{{10, 33}, {508, 342}}</string>
+									<string key="NSFrame">{{10, 33}, {508, 374}}</string>
 									<reference key="NSNextKeyView" ref="890740037"/>
 								</object>
 								<string key="NSLabel">3D Rendering</string>
@@ -8096,7 +8334,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 						</array>
 					</object>
 				</array>
-				<string key="NSFrameSize">{554, 412}</string>
+				<string key="NSFrameSize">{554, 447}</string>
 				<reference key="NSNextKeyView" ref="626099"/>
 				<string key="NSClassName">NSView</string>
 			</object>
@@ -21621,6 +21859,251 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 				<string key="NSFrameAutosaveName">3DRenderingSettingsPanel</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
+			<object class="NSWindowTemplate" id="348313646">
+				<int key="NSWindowStyleMask">279</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{196, 132}, {254, 112}}</string>
+				<int key="NSWTFlags">-461896704</int>
+				<string key="NSWindowTitle">Stylus Settings</string>
+				<string key="NSWindowClass">NSPanel</string>
+				<nil key="NSViewClass"/>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<object class="NSView" key="NSWindowView" id="229463459">
+					<nil key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSButton" id="384970688">
+							<reference key="NSNextResponder" ref="229463459"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{64, 43}, {125, 20}}</string>
+							<reference key="NSSuperview" ref="229463459"/>
+							<reference key="NSNextKeyView" ref="987967856"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="979263273">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">268566528</int>
+								<string key="NSContents">Enable Stylus Jitter</string>
+								<reference key="NSSupport" ref="26"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="384970688"/>
+								<int key="NSButtonFlags">1211912448</int>
+								<int key="NSButtonFlags2">2</int>
+								<reference key="NSNormalImage" ref="254121778"/>
+								<reference key="NSAlternateImage" ref="1000893652"/>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSTextField" id="344681810">
+							<reference key="NSNextResponder" ref="229463459"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{18, 74}, {54, 14}}</string>
+							<reference key="NSSuperview" ref="229463459"/>
+							<reference key="NSNextKeyView" ref="164999354"/>
+							<string key="NSReuseIdentifierKey">_NS:526</string>
+							<string key="NSHuggingPriority">{251, 750}</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="40119473">
+								<int key="NSCellFlags">68157504</int>
+								<int key="NSCellFlags2">272761856</int>
+								<string key="NSContents">Pressure:</string>
+								<reference key="NSSupport" ref="26"/>
+								<string key="NSCellIdentifier">_NS:526</string>
+								<reference key="NSControlView" ref="344681810"/>
+								<reference key="NSBackgroundColor" ref="266180242"/>
+								<reference key="NSTextColor" ref="353533534"/>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+							<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+						</object>
+						<object class="NSButton" id="987967856">
+							<reference key="NSNextResponder" ref="229463459"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{46, 19}, {162, 19}}</string>
+							<reference key="NSSuperview" ref="229463459"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="806551365">
+								<int key="NSCellFlags">-2080374784</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Save Settings as Default</string>
+								<object class="NSFont" key="NSSupport">
+									<bool key="IBIsSystemFont">YES</bool>
+									<double key="NSSize">12</double>
+									<int key="NSfFlags">787</int>
+								</object>
+								<reference key="NSControlView" ref="987967856"/>
+								<int key="NSButtonFlags">-2038153216</int>
+								<int key="NSButtonFlags2">164</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="NSSlider" id="164999354">
+							<reference key="NSNextResponder" ref="229463459"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{76, 66}, {110, 26}}</string>
+							<reference key="NSSuperview" ref="229463459"/>
+							<reference key="NSNextKeyView" ref="902277940"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSSliderCell" key="NSCell" id="1011301801">
+								<int key="NSCellFlags">-2080112384</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="164999354"/>
+								<double key="NSMaxValue">100</double>
+								<double key="NSMinValue">0.0</double>
+								<double key="NSValue">50</double>
+								<double key="NSAltIncValue">0.0</double>
+								<int key="NSNumberOfTickMarks">11</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="NSTextField" id="902277940">
+							<reference key="NSNextResponder" ref="229463459"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{190, 69}, {46, 14}}</string>
+							<reference key="NSSuperview" ref="229463459"/>
+							<reference key="NSNextKeyView" ref="384970688"/>
+							<string key="NSReuseIdentifierKey">_NS:526</string>
+							<string key="NSHuggingPriority">{251, 750}</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="379569646">
+								<int key="NSCellFlags">68157504</int>
+								<int key="NSCellFlags2">272761856</int>
+								<reference key="NSSupport" ref="26"/>
+								<object class="NSNumberFormatter" key="NSFormatter" id="691936300">
+									<dictionary class="NSMutableDictionary" key="NS.attributes">
+										<boolean value="NO" key="allowsFloats"/>
+										<integer value="1040" key="formatterBehavior"/>
+										<reference key="locale" ref="78706403"/>
+										<string key="negativeInfinitySymbol">-∞</string>
+										<string key="negativeSuffix">%</string>
+										<string key="nilSymbol"/>
+										<string key="positiveInfinitySymbol">+∞</string>
+										<string key="positiveSuffix">%</string>
+									</dictionary>
+									<string key="NS.positiveformat">#'%'</string>
+									<string key="NS.negativeformat">#'%'</string>
+									<nil key="NS.positiveattrs"/>
+									<nil key="NS.negativeattrs"/>
+									<nil key="NS.zero"/>
+									<object class="NSAttributedString" key="NS.nil">
+										<string key="NSString"/>
+									</object>
+									<object class="NSAttributedString" key="NS.nan">
+										<string key="NSString">NaN</string>
+										<reference key="NSAttributes" ref="292804101"/>
+									</object>
+									<reference key="NS.min" ref="722528714"/>
+									<reference key="NS.max" ref="722528714"/>
+									<object class="NSDecimalNumberHandler" key="NS.rounding">
+										<int key="NS.roundingmode">3</int>
+										<bool key="NS.raise.overflow">YES</bool>
+										<bool key="NS.raise.underflow">YES</bool>
+										<bool key="NS.raise.dividebyzero">YES</bool>
+									</object>
+									<string key="NS.decimal">.</string>
+									<string key="NS.thousand">,</string>
+									<bool key="NS.hasthousands">NO</bool>
+									<bool key="NS.localized">NO</bool>
+									<bool key="NS.allowsfloats">NO</bool>
+								</object>
+								<string key="NSPlaceholderString">u%%</string>
+								<string key="NSCellIdentifier">_NS:526</string>
+								<reference key="NSControlView" ref="902277940"/>
+								<reference key="NSBackgroundColor" ref="266180242"/>
+								<reference key="NSTextColor" ref="353533534"/>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+							<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+						</object>
+						<object class="NSTextField" id="258216449">
+							<reference key="NSNextResponder" ref="229463459"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{73, 91}, {26, 11}}</string>
+							<reference key="NSSuperview" ref="229463459"/>
+							<reference key="NSNextKeyView" ref="869969908"/>
+							<string key="NSReuseIdentifierKey">_NS:526</string>
+							<string key="NSHuggingPriority">{251, 750}</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="224501511">
+								<int key="NSCellFlags">68157504</int>
+								<int key="NSCellFlags2">138675200</int>
+								<string key="NSContents">0</string>
+								<reference key="NSSupport" ref="22"/>
+								<string key="NSCellIdentifier">_NS:526</string>
+								<reference key="NSControlView" ref="258216449"/>
+								<reference key="NSBackgroundColor" ref="266180242"/>
+								<reference key="NSTextColor" ref="353533534"/>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+							<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+						</object>
+						<object class="NSTextField" id="869969908">
+							<reference key="NSNextResponder" ref="229463459"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{118, 91}, {26, 11}}</string>
+							<reference key="NSSuperview" ref="229463459"/>
+							<reference key="NSNextKeyView" ref="601890820"/>
+							<string key="NSReuseIdentifierKey">_NS:526</string>
+							<string key="NSHuggingPriority">{251, 750}</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="570795788">
+								<int key="NSCellFlags">68157504</int>
+								<int key="NSCellFlags2">138675200</int>
+								<string key="NSContents">50</string>
+								<reference key="NSSupport" ref="22"/>
+								<string key="NSCellIdentifier">_NS:526</string>
+								<reference key="NSControlView" ref="869969908"/>
+								<reference key="NSBackgroundColor" ref="266180242"/>
+								<reference key="NSTextColor" ref="353533534"/>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+							<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+						</object>
+						<object class="NSTextField" id="601890820">
+							<reference key="NSNextResponder" ref="229463459"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{163, 91}, {26, 11}}</string>
+							<reference key="NSSuperview" ref="229463459"/>
+							<reference key="NSNextKeyView" ref="344681810"/>
+							<string key="NSReuseIdentifierKey">_NS:526</string>
+							<string key="NSHuggingPriority">{251, 750}</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="1058309937">
+								<int key="NSCellFlags">68157504</int>
+								<int key="NSCellFlags2">138675200</int>
+								<string key="NSContents">100</string>
+								<reference key="NSSupport" ref="22"/>
+								<string key="NSCellIdentifier">_NS:526</string>
+								<reference key="NSControlView" ref="601890820"/>
+								<reference key="NSBackgroundColor" ref="266180242"/>
+								<reference key="NSTextColor" ref="353533534"/>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+							<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+						</object>
+					</array>
+					<string key="NSFrameSize">{254, 112}</string>
+					<reference key="NSNextKeyView" ref="258216449"/>
+					<string key="NSReuseIdentifierKey">_NS:21</string>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1177}}</string>
+				<string key="NSFrameAutosaveName">StylusSettingsPanel</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
 			<object class="NSWindowTemplate" id="505725567">
 				<int key="NSWindowStyleMask">279</int>
 				<int key="NSWindowBacking">2</int>
@@ -35058,6 +35541,14 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 					</object>
 					<int key="connectionID">10019</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">writeDefaultsStylusSettings:</string>
+						<reference key="source" ref="231770064"/>
+						<reference key="destination" ref="987967856"/>
+					</object>
+					<int key="connectionID">10078</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">content</string>
@@ -39214,6 +39705,110 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 					</object>
 					<int key="connectionID">10008</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">makeKeyAndOrderFront:</string>
+						<reference key="source" ref="348313646"/>
+						<reference key="destination" ref="170447076"/>
+					</object>
+					<int key="connectionID">10048</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: selection.cdsController.stylusEnableJitter</string>
+						<reference key="source" ref="384970688"/>
+						<reference key="destination" ref="582168938"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="384970688"/>
+							<reference key="NSDestination" ref="582168938"/>
+							<string key="NSLabel">value: selection.cdsController.stylusEnableJitter</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">selection.cdsController.stylusEnableJitter</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">10059</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: selection.cdsController.stylusPressure</string>
+						<reference key="source" ref="164999354"/>
+						<reference key="destination" ref="582168938"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="164999354"/>
+							<reference key="NSDestination" ref="582168938"/>
+							<string key="NSLabel">value: selection.cdsController.stylusPressure</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">selection.cdsController.stylusPressure</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">10066</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: selection.cdsController.stylusPressure</string>
+						<reference key="source" ref="902277940"/>
+						<reference key="destination" ref="582168938"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="902277940"/>
+							<reference key="NSDestination" ref="582168938"/>
+							<string key="NSLabel">value: selection.cdsController.stylusPressure</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">selection.cdsController.stylusPressure</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">10071</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: values.Emulation_StylusEnableJitter</string>
+						<reference key="source" ref="773356702"/>
+						<reference key="destination" ref="178548672"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="773356702"/>
+							<reference key="NSDestination" ref="178548672"/>
+							<string key="NSLabel">value: values.Emulation_StylusEnableJitter</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">values.Emulation_StylusEnableJitter</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">10102</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: values.Emulation_StylusPressure</string>
+						<reference key="source" ref="239207266"/>
+						<reference key="destination" ref="178548672"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="239207266"/>
+							<reference key="NSDestination" ref="178548672"/>
+							<string key="NSLabel">value: values.Emulation_StylusPressure</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">values.Emulation_StylusPressure</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">10099</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: values.Emulation_StylusPressure</string>
+						<reference key="source" ref="642300079"/>
+						<reference key="destination" ref="178548672"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="642300079"/>
+							<reference key="NSDestination" ref="178548672"/>
+							<string key="NSLabel">value: values.Emulation_StylusPressure</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">values.Emulation_StylusPressure</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">10107</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -39558,6 +40153,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 							<reference ref="944432143"/>
 							<reference ref="17916560"/>
 							<reference ref="941591429"/>
+							<reference ref="170447076"/>
 						</array>
 						<reference key="parent" ref="15294006"/>
 					</object>
@@ -47858,8 +48454,9 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 						<array class="NSMutableArray" key="children">
 							<reference ref="699930286"/>
 							<reference ref="1034534989"/>
-							<reference ref="337932383"/>
+							<reference ref="704971554"/>
 							<reference ref="808054783"/>
+							<reference ref="337932383"/>
 						</array>
 						<reference key="parent" ref="1008833987"/>
 					</object>
@@ -48205,41 +48802,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 						<reference key="object" ref="1049325562"/>
 						<reference key="parent" ref="1002748640"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2344</int>
-						<reference key="object" ref="337932383"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="743074144"/>
-							<reference ref="396299062"/>
-						</array>
-						<reference key="parent" ref="461624007"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2369</int>
-						<reference key="object" ref="743074144"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="16571944"/>
-						</array>
-						<reference key="parent" ref="337932383"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2367</int>
-						<reference key="object" ref="396299062"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="340220192"/>
-						</array>
-						<reference key="parent" ref="337932383"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2368</int>
-						<reference key="object" ref="340220192"/>
-						<reference key="parent" ref="396299062"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2370</int>
-						<reference key="object" ref="16571944"/>
-						<reference key="parent" ref="743074144"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">5186</int>
 						<reference key="object" ref="808054783"/>
@@ -52823,6 +53385,295 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 						<reference key="object" ref="1002114055"/>
 						<reference key="parent" ref="977831859"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10036</int>
+						<reference key="object" ref="348313646"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="229463459"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Stylus Settings</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10037</int>
+						<reference key="object" ref="229463459"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="344681810"/>
+							<reference ref="164999354"/>
+							<reference ref="902277940"/>
+							<reference ref="384970688"/>
+							<reference ref="987967856"/>
+							<reference ref="258216449"/>
+							<reference ref="601890820"/>
+							<reference ref="869969908"/>
+						</array>
+						<reference key="parent" ref="348313646"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10038</int>
+						<reference key="object" ref="384970688"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="979263273"/>
+						</array>
+						<reference key="parent" ref="229463459"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10039</int>
+						<reference key="object" ref="979263273"/>
+						<reference key="parent" ref="384970688"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10043</int>
+						<reference key="object" ref="344681810"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="40119473"/>
+						</array>
+						<reference key="parent" ref="229463459"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10044</int>
+						<reference key="object" ref="40119473"/>
+						<reference key="parent" ref="344681810"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10047</int>
+						<reference key="object" ref="170447076"/>
+						<reference key="parent" ref="597556522"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10060</int>
+						<reference key="object" ref="987967856"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="806551365"/>
+						</array>
+						<reference key="parent" ref="229463459"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10061</int>
+						<reference key="object" ref="806551365"/>
+						<reference key="parent" ref="987967856"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10063</int>
+						<reference key="object" ref="164999354"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1011301801"/>
+						</array>
+						<reference key="parent" ref="229463459"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10064</int>
+						<reference key="object" ref="1011301801"/>
+						<reference key="parent" ref="164999354"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10067</int>
+						<reference key="object" ref="902277940"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="379569646"/>
+						</array>
+						<reference key="parent" ref="229463459"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10068</int>
+						<reference key="object" ref="379569646"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="691936300"/>
+						</array>
+						<reference key="parent" ref="902277940"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10069</int>
+						<reference key="object" ref="691936300"/>
+						<reference key="parent" ref="379569646"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10072</int>
+						<reference key="object" ref="258216449"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="224501511"/>
+						</array>
+						<reference key="parent" ref="229463459"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10073</int>
+						<reference key="object" ref="224501511"/>
+						<reference key="parent" ref="258216449"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10074</int>
+						<reference key="object" ref="601890820"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1058309937"/>
+						</array>
+						<reference key="parent" ref="229463459"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10075</int>
+						<reference key="object" ref="1058309937"/>
+						<reference key="parent" ref="601890820"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10076</int>
+						<reference key="object" ref="869969908"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="570795788"/>
+						</array>
+						<reference key="parent" ref="229463459"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10077</int>
+						<reference key="object" ref="570795788"/>
+						<reference key="parent" ref="869969908"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10079</int>
+						<reference key="object" ref="704971554"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="90098197"/>
+							<reference ref="239207266"/>
+							<reference ref="642300079"/>
+							<reference ref="765549650"/>
+							<reference ref="943830921"/>
+							<reference ref="636105289"/>
+							<reference ref="773356702"/>
+						</array>
+						<reference key="parent" ref="461624007"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10080</int>
+						<reference key="object" ref="773356702"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="505084566"/>
+						</array>
+						<reference key="parent" ref="704971554"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10081</int>
+						<reference key="object" ref="90098197"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="925694308"/>
+						</array>
+						<reference key="parent" ref="704971554"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10082</int>
+						<reference key="object" ref="239207266"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="660652407"/>
+						</array>
+						<reference key="parent" ref="704971554"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10083</int>
+						<reference key="object" ref="642300079"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="308235019"/>
+						</array>
+						<reference key="parent" ref="704971554"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10084</int>
+						<reference key="object" ref="765549650"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1059052938"/>
+						</array>
+						<reference key="parent" ref="704971554"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10085</int>
+						<reference key="object" ref="943830921"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="30018622"/>
+						</array>
+						<reference key="parent" ref="704971554"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10086</int>
+						<reference key="object" ref="636105289"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="665264944"/>
+						</array>
+						<reference key="parent" ref="704971554"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10087</int>
+						<reference key="object" ref="665264944"/>
+						<reference key="parent" ref="636105289"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10088</int>
+						<reference key="object" ref="30018622"/>
+						<reference key="parent" ref="943830921"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10089</int>
+						<reference key="object" ref="1059052938"/>
+						<reference key="parent" ref="765549650"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10090</int>
+						<reference key="object" ref="308235019"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="981244020"/>
+						</array>
+						<reference key="parent" ref="642300079"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10091</int>
+						<reference key="object" ref="981244020"/>
+						<reference key="parent" ref="308235019"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10092</int>
+						<reference key="object" ref="660652407"/>
+						<reference key="parent" ref="239207266"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10093</int>
+						<reference key="object" ref="925694308"/>
+						<reference key="parent" ref="90098197"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10094</int>
+						<reference key="object" ref="505084566"/>
+						<reference key="parent" ref="773356702"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2344</int>
+						<reference key="object" ref="337932383"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="743074144"/>
+							<reference ref="396299062"/>
+						</array>
+						<reference key="parent" ref="461624007"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2369</int>
+						<reference key="object" ref="743074144"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="16571944"/>
+						</array>
+						<reference key="parent" ref="337932383"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2367</int>
+						<reference key="object" ref="396299062"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="340220192"/>
+						</array>
+						<reference key="parent" ref="337932383"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2368</int>
+						<reference key="object" ref="340220192"/>
+						<reference key="parent" ref="396299062"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2370</int>
+						<reference key="object" ref="16571944"/>
+						<reference key="parent" ref="743074144"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -52848,6 +53699,92 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 				<string key="10029.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="10032.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="10034.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10036.IBPersistedLastKnownCanvasPosition">{87, 599}</string>
+				<string key="10036.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="10036.NSWindowTemplate.visibleAtLaunch"/>
+				<reference key="10037.IBNSViewMetadataGestureRecognizers" ref="0"/>
+				<string key="10037.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="10038.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="384970688"/>
+						<string key="toolTip">Enabling this setting will cause periodic adjustments to the touch location of the stylus, simulating human hand jitter. Some games may require this setting enabled to work properly. However, TAS recording will be less accurate.</string>
+					</object>
+				</object>
+				<string key="10038.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10039.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10043.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableAttributedString" key="10043.notes">
+					<object class="NSMutableString" key="NSString">
+						<characters key="NS.bytes"/>
+					</object>
+				</object>
+				<string key="10044.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10047.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10060.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10061.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="10063.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="164999354"/>
+						<string key="toolTip">Adjusts the pressure of the NDS stylus upon the touch screen, where 0% is the lightest pressure and 100% is the heaviest pressure. This setting can be useful for certain homebrew ROMs.</string>
+					</object>
+				</object>
+				<string key="10063.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10064.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10067.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10068.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1040" key="10069.IBNumberFormatterBehaviorMetadataKey"/>
+				<boolean value="NO" key="10069.IBNumberFormatterLocalizesFormatMetadataKey"/>
+				<string key="10069.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10072.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10073.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10074.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10075.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10076.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10077.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<reference key="10079.IBNSViewMetadataGestureRecognizers" ref="0"/>
+				<string key="10079.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="10080.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="773356702"/>
+						<string key="toolTip">Enabling this setting will cause periodic adjustments to the touch location of the stylus by default, simulating human hand jitter. Some games may require this setting enabled to work properly. However, TAS recording will be less accurate.</string>
+					</object>
+				</object>
+				<string key="10080.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10081.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableAttributedString" key="10081.notes">
+					<object class="NSMutableString" key="NSString">
+						<characters key="NS.bytes"/>
+					</object>
+				</object>
+				<object class="NSMutableDictionary" key="10082.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="239207266"/>
+						<string key="toolTip">Adjusts the pressure of the NDS stylus upon the touch screen by default, where 0% is the lightest pressure and 100% is the heaviest pressure. This setting can be useful for certain homebrew ROMs.</string>
+					</object>
+				</object>
+				<string key="10082.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10083.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10084.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10085.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10086.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10087.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10088.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10089.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10090.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1040" key="10091.IBNumberFormatterBehaviorMetadataKey"/>
+				<boolean value="NO" key="10091.IBNumberFormatterLocalizesFormatMetadataKey"/>
+				<string key="10091.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10092.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10093.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10094.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1034.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1035.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1036.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -53096,7 +54033,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 				</object>
 				<string key="2332.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<reference key="2339.IBNSViewMetadataGestureRecognizers" ref="0"/>
-				<string key="2339.IBPersistedLastKnownCanvasPosition">{225, 911}</string>
+				<string key="2339.IBPersistedLastKnownCanvasPosition">{225, 928.5}</string>
 				<string key="2339.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2340.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2340.designableToolbarItemIdentifier">Emulation</string>
@@ -53406,7 +54343,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 				<string key="3666.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="3667.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="3709.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="3712.IBPersistedLastKnownCanvasPosition">{492, 305.5}</string>
+				<string key="3712.IBPersistedLastKnownCanvasPosition">{50, 735.5}</string>
 				<string key="3712.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="3712.IBWindowTemplateEditedContentRect">{{942, 249}, {288, 511}}</string>
 				<boolean value="NO" key="3712.NSWindowTemplate.visibleAtLaunch"/>
@@ -53558,7 +54495,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 				<reference key="3788.IBNSViewMetadataGestureRecognizers" ref="0"/>
 				<string key="3788.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="3789.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="3790.IBPersistedLastKnownCanvasPosition">{990.5, 1116.5}</string>
+				<string key="3790.IBPersistedLastKnownCanvasPosition">{153.5, 729.5}</string>
 				<string key="3790.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="3790.IBWindowTemplateEditedContentRect">{{84, 481}, {301, 467}}</string>
 				<boolean value="NO" key="3790.NSWindowTemplate.visibleAtLaunch"/>
@@ -56078,7 +57015,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">10035</int>
+			<int key="maxID">10107</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -56909,6 +57846,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 						<string key="writeDefaultsEmulationSettings:">id</string>
 						<string key="writeDefaultsSlot1Settings:">id</string>
 						<string key="writeDefaultsSoundSettings:">id</string>
+						<string key="writeDefaultsStylusSettings:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
 						<object class="IBActionInfo" key="autoholdSet:">
@@ -57107,6 +58045,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 							<string key="name">writeDefaultsSoundSettings:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="writeDefaultsStylusSettings:">
+							<string key="name">writeDefaultsStylusSettings:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="cdsCoreController">NSObjectController</string>
@@ -57260,6 +58202,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 						<string key="writeDefaultsEmulationSettings:">id</string>
 						<string key="writeDefaultsSlot1Settings:">id</string>
 						<string key="writeDefaultsSoundSettings:">id</string>
+						<string key="writeDefaultsStylusSettings:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
 						<object class="IBActionInfo" key="autoholdClear:">
@@ -57462,6 +58405,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
 							<string key="name">writeDefaultsSoundSettings:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="writeDefaultsStylusSettings:">
+							<string key="name">writeDefaultsStylusSettings:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
diff --git a/desmume/src/cocoa/userinterface/EmuControllerDelegate.h b/desmume/src/cocoa/userinterface/EmuControllerDelegate.h
index d9b80569e..fde764f22 100644
--- a/desmume/src/cocoa/userinterface/EmuControllerDelegate.h
+++ b/desmume/src/cocoa/userinterface/EmuControllerDelegate.h
@@ -231,6 +231,7 @@ class AudioSampleBlockGenerator;
 - (IBAction) writeDefaultsEmulationSettings:(id)sender;
 - (IBAction) writeDefaultsSlot1Settings:(id)sender;
 - (IBAction) writeDefaultsSoundSettings:(id)sender;
+- (IBAction) writeDefaultsStylusSettings:(id)sender;
 
 - (IBAction) closeSheet:(id)sender;
 
diff --git a/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm b/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm
index 0a2c4946d..d40f6fccc 100644
--- a/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm
+++ b/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm
@@ -1002,6 +1002,15 @@
 	[[NSUserDefaults standardUserDefaults] setInteger:[[speakerBindings valueForKey:@"spuSyncMethod"] integerValue] forKey:@"SPU_SyncMethod"];
 }
 
+- (IBAction) writeDefaultsStylusSettings:(id)sender
+{
+	CocoaDSCore *cdsCore = (CocoaDSCore *)[cdsCoreController content];
+	CocoaDSController *cdsController = [cdsCore cdsController];
+	
+	[[NSUserDefaults standardUserDefaults] setInteger:[cdsController stylusPressure] forKey:@"Emulation_StylusPressure"];
+	[[NSUserDefaults standardUserDefaults] setBool:[cdsController stylusEnableJitter] forKey:@"Emulation_StylusEnableJitter"];
+}
+
 - (IBAction) closeSheet:(id)sender
 {
 	NSWindow *sheet = [(NSControl *)sender window];
@@ -2185,6 +2194,10 @@
 	[[cdsCore cdsGPU] setRender3DLineHack:[[NSUserDefaults standardUserDefaults] boolForKey:@"Render3D_LineHack"]];
 	[[cdsCore cdsGPU] setRender3DMultisample:[[NSUserDefaults standardUserDefaults] boolForKey:@"Render3D_Multisample"]];
 	[[cdsCore cdsGPU] setRender3DFragmentSamplingHack:[[NSUserDefaults standardUserDefaults] boolForKey:@"Render3D_FragmentSamplingHack"]];
+	
+	// Set the stylus options per user preferences.
+	[[cdsCore cdsController] setStylusPressure:[[NSUserDefaults standardUserDefaults] integerForKey:@"Emulation_StylusPressure"]];
+	[[cdsCore cdsController] setStylusEnableJitter:[[NSUserDefaults standardUserDefaults] boolForKey:@"Emulation_StylusEnableJitter"]];
 }
 
 #pragma mark NSUserInterfaceValidations Protocol