diff --git a/Changes.txt b/Changes.txt
index 5e005ad1d..30aab3a2c 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -75,6 +75,12 @@
 
       The application is now known as 'Stella' (instead of StellaOSX).
 
+      Two versions are available: the first is a 32-bit Universal Binary
+      for OSX 10.4 - 10.6, and the second is a 32/64-bit Intel-only for
+      OSX 10.5 - 10.6 (64-bit requires 10.6).  The Intel version is
+      compiled with the very latest compiler (Clang), resulting in
+      better performance.
+
       The keyboard handling is changed to match other systems in terms of
       where the keys actually are on the keyboard (ie, the OSX Command key
       corresponds to Alt, and the OSX Control key corresponds to Control).
diff --git a/src/macosx/stella.xcodeproj/project.pbxproj b/src/macosx/stella.xcodeproj/project.pbxproj
index b0bb93537..0595f2494 100644
--- a/src/macosx/stella.xcodeproj/project.pbxproj
+++ b/src/macosx/stella.xcodeproj/project.pbxproj
@@ -740,10 +740,10 @@
 			children = (
 				2D1A6CD4085135F9007CDBA8 /* AboutBox.h */,
 				2D1A6CD5085135F9007CDBA8 /* AboutBox.m */,
+				2D62C40E085011050063A4A3 /* Menus.h */,
+				2D47A45208491D4500ABFB6A /* Menus.m */,
 				2DDBEBE3084582C400812C11 /* Preferences.h */,
 				2DDBEBE4084582C400812C11 /* Preferences.m */,
-				2D47A45208491D4500ABFB6A /* Menus.m */,
-				2D62C40E085011050063A4A3 /* Menus.h */,
 				F5A47A9D01A0482F01D3D55B /* SDLMain.h */,
 				F5A47A9E01A0483001D3D55B /* SDLMain.m */,
 			);
@@ -832,8 +832,6 @@
 		2D20F9E308C603C500A73076 /* gui */ = {
 			isa = PBXGroup;
 			children = (
-				DC4AC6ED0DC8DACB00CD3AD2 /* RiotWidget.cxx */,
-				DC4AC6EE0DC8DACB00CD3AD2 /* RiotWidget.hxx */,
 				2D23318F0900B5EF00613B1F /* AudioWidget.cxx */,
 				2D2331900900B5EF00613B1F /* AudioWidget.hxx */,
 				2D20F9E408C603EC00A73076 /* ColorWidget.cxx */,
@@ -850,6 +848,8 @@
 				2D20F9EF08C603EC00A73076 /* PromptWidget.hxx */,
 				2D20F9F008C603EC00A73076 /* RamWidget.cxx */,
 				2D20F9F108C603EC00A73076 /* RamWidget.hxx */,
+				DC4AC6ED0DC8DACB00CD3AD2 /* RiotWidget.cxx */,
+				DC4AC6EE0DC8DACB00CD3AD2 /* RiotWidget.hxx */,
 				2D20F9F208C603EC00A73076 /* RomListWidget.cxx */,
 				2D20F9F308C603EC00A73076 /* RomListWidget.hxx */,
 				2D20F9F408C603EC00A73076 /* RomWidget.cxx */,
@@ -873,25 +873,25 @@
 		2D6050C5089876F300C6DE89 /* common */ = {
 			isa = PBXGroup;
 			children = (
-				DCECDB0210B9DC0400AF4E1B /* bspf.hxx */,
-				DCECDB0310B9DC0400AF4E1B /* Snapshot.cxx */,
-				DCECDB0410B9DC0400AF4E1B /* Snapshot.hxx */,
-				DC5D1AA6102C6FC900E59AC1 /* Stack.hxx */,
-				DCB9DA5E0FCD527000B192F6 /* GLShaderProgs.hxx */,
-				DCF467BC0F9399F500B25D7A /* Version.hxx */,
 				DCF467B10F93993B00B25D7A /* Array.hxx */,
-				DCF467B20F93993B00B25D7A /* SharedPtr.hxx */,
-				DCF467B30F93993B00B25D7A /* SoundNull.cxx */,
-				DCF467B40F93993B00B25D7A /* SoundNull.hxx */,
-				DCD56D3A0B247DB40092F9F8 /* RectList.cxx */,
-				DCD56D3B0B247DB40092F9F8 /* RectList.hxx */,
+				DCECDB0210B9DC0400AF4E1B /* bspf.hxx */,
 				2D733D5D062893E7006265D9 /* FrameBufferGL.cxx */,
 				2D733D5E062893E7006265D9 /* FrameBufferGL.hxx */,
 				2D733D61062893E7006265D9 /* FrameBufferSoft.cxx */,
 				2D733D62062893E7006265D9 /* FrameBufferSoft.hxx */,
+				DCB9DA5E0FCD527000B192F6 /* GLShaderProgs.hxx */,
 				2DDBEA0A0845700300812C11 /* mainSDL.cxx */,
+				DCD56D3A0B247DB40092F9F8 /* RectList.cxx */,
+				DCD56D3B0B247DB40092F9F8 /* RectList.hxx */,
+				DCF467B20F93993B00B25D7A /* SharedPtr.hxx */,
+				DCECDB0310B9DC0400AF4E1B /* Snapshot.cxx */,
+				DCECDB0410B9DC0400AF4E1B /* Snapshot.hxx */,
+				DCF467B30F93993B00B25D7A /* SoundNull.cxx */,
+				DCF467B40F93993B00B25D7A /* SoundNull.hxx */,
 				2DDA34020665817D00CDD299 /* SoundSDL.cxx */,
 				2DDA34030665817D00CDD299 /* SoundSDL.hxx */,
+				DC5D1AA6102C6FC900E59AC1 /* Stack.hxx */,
+				DCF467BC0F9399F500B25D7A /* Version.hxx */,
 			);
 			name = common;
 			sourceTree = "<group>";
@@ -899,13 +899,13 @@
 		2D6050C60898771C00C6DE89 /* macosx */ = {
 			isa = PBXGroup;
 			children = (
-				DC1FC1880DB3B2C7009B3DF7 /* SerialPortMACOSX.cxx */,
-				DC1FC1890DB3B2C7009B3DF7 /* SerialPortMACOSX.hxx */,
+				2D28DDE409DC2D9F00A17585 /* MenusEvents.h */,
 				2DDBEA0E0845709700812C11 /* OSystemMACOSX.cxx */,
 				2DDBEA0F0845709700812C11 /* OSystemMACOSX.hxx */,
+				DC1FC1880DB3B2C7009B3DF7 /* SerialPortMACOSX.cxx */,
+				DC1FC1890DB3B2C7009B3DF7 /* SerialPortMACOSX.hxx */,
 				2D944866062911CD00DD9879 /* SettingsMACOSX.cxx */,
 				2D94486C0629124700DD9879 /* SettingsMACOSX.hxx */,
-				2D28DDE409DC2D9F00A17585 /* MenusEvents.h */,
 			);
 			name = macosx;
 			sourceTree = "<group>";
@@ -921,59 +921,22 @@
 		2D6050CC0898776500C6DE89 /* emucore */ = {
 			isa = PBXGroup;
 			children = (
-				DC64EB1E1152F9C000DC9140 /* CartDPCPlus.cxx */,
-				DC64EB1F1152F9C000DC9140 /* CartDPCPlus.hxx */,
-				DC84E11A1135988E00CA7C9D /* Genesis.cxx */,
-				DC84E11B1135988E00CA7C9D /* Genesis.hxx */,
-				DCECDAF210B9DBDC00AF4E1B /* Device.cxx */,
-				DCECDAF310B9DBDC00AF4E1B /* Device.hxx */,
-				DCECDAF410B9DBDC00AF4E1B /* M6502.cxx */,
-				DCECDAF510B9DBDC00AF4E1B /* M6502.hxx */,
-				DCECDAF610B9DBDC00AF4E1B /* NullDev.cxx */,
-				DCECDAF710B9DBDC00AF4E1B /* NullDev.hxx */,
-				DCECDAF810B9DBDC00AF4E1B /* System.cxx */,
-				DCECDAF910B9DBDC00AF4E1B /* System.hxx */,
-				DCF7B0D910A762FC007A2870 /* CartF0.cxx */,
-				DCF7B0DA10A762FC007A2870 /* CartF0.hxx */,
-				DCF7B0DB10A762FC007A2870 /* CartFA.cxx */,
-				DCF7B0DC10A762FC007A2870 /* CartFA.hxx */,
-				DCF467BE0F939A1400B25D7A /* CartEF.cxx */,
-				DCF467BF0F939A1400B25D7A /* CartEF.hxx */,
-				DCF467C00F939A1400B25D7A /* CartEFSC.cxx */,
-				DCF467C10F939A1400B25D7A /* CartEFSC.hxx */,
-				DC9EA8850F729A36000452B5 /* KidVid.cxx */,
-				DC9EA8860F729A36000452B5 /* KidVid.hxx */,
-				DC932D3F0F278A5200FEFEFC /* DefProps.hxx */,
-				DC932D400F278A5200FEFEFC /* Serializable.hxx */,
-				DC932D410F278A5200FEFEFC /* SerialPort.hxx */,
-				DC932D420F278A5200FEFEFC /* TIATables.cxx */,
-				DC932D430F278A5200FEFEFC /* TIATables.hxx */,
-				DCE6EB200DD9ADA00047AC28 /* TrackBall.cxx */,
-				DCE6EB210DD9ADA00047AC28 /* TrackBall.hxx */,
-				DC4AC6F10DC8DAEF00CD3AD2 /* SaveKey.cxx */,
-				DC4AC6F20DC8DAEF00CD3AD2 /* SaveKey.hxx */,
-				DC11F78B0DB36933003B505E /* MT24LC256.cxx */,
-				DC11F78C0DB36933003B505E /* MT24LC256.hxx */,
 				DC487FB40DA5350900E12499 /* AtariVox.cxx */,
 				DC487FB50DA5350900E12499 /* AtariVox.hxx */,
-				DCA23AE70D75B22500F77B33 /* CartX07.cxx */,
-				DCA23AE80D75B22500F77B33 /* CartX07.hxx */,
-				DC0984830D3985160073C852 /* CartSB.cxx */,
-				DC0984840D3985160073C852 /* CartSB.hxx */,
-				DC07A3C60CAD738A009B4BC9 /* StateManager.cxx */,
-				DC07A3C70CAD738A009B4BC9 /* StateManager.hxx */,
-				DCEECE540B5E5E540021D754 /* Cart0840.cxx */,
-				DCEECE550B5E5E540021D754 /* Cart0840.hxx */,
-				DCD56D360B247D920092F9F8 /* Cart4A50.cxx */,
-				DCD56D370B247D920092F9F8 /* Cart4A50.hxx */,
 				2DE2DF100627AE07006BEC99 /* Booster.cxx */,
 				2DE2DF110627AE07006BEC99 /* Booster.hxx */,
 				2DE2DF120627AE07006BEC99 /* Cart.cxx */,
 				2DE2DF130627AE07006BEC99 /* Cart.hxx */,
+				DCEECE540B5E5E540021D754 /* Cart0840.cxx */,
+				DCEECE550B5E5E540021D754 /* Cart0840.hxx */,
 				2DE2DF140627AE07006BEC99 /* Cart2K.cxx */,
 				2DE2DF150627AE07006BEC99 /* Cart2K.hxx */,
+				2D9555D90880E78000466554 /* Cart3E.cxx */,
+				2D9555DA0880E78000466554 /* Cart3E.hxx */,
 				2DE2DF160627AE07006BEC99 /* Cart3F.cxx */,
 				2DE2DF170627AE07006BEC99 /* Cart3F.hxx */,
+				DCD56D360B247D920092F9F8 /* Cart4A50.cxx */,
+				DCD56D370B247D920092F9F8 /* Cart4A50.hxx */,
 				2DE2DF180627AE07006BEC99 /* Cart4K.cxx */,
 				2DE2DF190627AE07006BEC99 /* Cart4K.hxx */,
 				2DE2DF1A0627AE07006BEC99 /* CartAR.cxx */,
@@ -982,12 +945,18 @@
 				2DE2DF1D0627AE07006BEC99 /* CartCV.hxx */,
 				2DE2DF1E0627AE07006BEC99 /* CartDPC.cxx */,
 				2DE2DF1F0627AE07006BEC99 /* CartDPC.hxx */,
+				DC64EB1E1152F9C000DC9140 /* CartDPCPlus.cxx */,
+				DC64EB1F1152F9C000DC9140 /* CartDPCPlus.hxx */,
 				2DE2DF200627AE07006BEC99 /* CartE0.cxx */,
 				2DE2DF210627AE07006BEC99 /* CartE0.hxx */,
-				2D9555D90880E78000466554 /* Cart3E.cxx */,
-				2D9555DA0880E78000466554 /* Cart3E.hxx */,
 				2DE2DF220627AE07006BEC99 /* CartE7.cxx */,
 				2DE2DF230627AE07006BEC99 /* CartE7.hxx */,
+				DCF467BE0F939A1400B25D7A /* CartEF.cxx */,
+				DCF467BF0F939A1400B25D7A /* CartEF.hxx */,
+				DCF467C00F939A1400B25D7A /* CartEFSC.cxx */,
+				DCF467C10F939A1400B25D7A /* CartEFSC.hxx */,
+				DCF7B0D910A762FC007A2870 /* CartF0.cxx */,
+				DCF7B0DA10A762FC007A2870 /* CartF0.hxx */,
 				2DE2DF240627AE07006BEC99 /* CartF4.cxx */,
 				2DE2DF250627AE07006BEC99 /* CartF4.hxx */,
 				2DE2DF260627AE07006BEC99 /* CartF4SC.cxx */,
@@ -1000,16 +969,25 @@
 				2DE2DF2D0627AE07006BEC99 /* CartF8.hxx */,
 				2DE2DF2E0627AE07006BEC99 /* CartF8SC.cxx */,
 				2DE2DF2F0627AE07006BEC99 /* CartF8SC.hxx */,
+				DCF7B0DB10A762FC007A2870 /* CartFA.cxx */,
+				DCF7B0DC10A762FC007A2870 /* CartFA.hxx */,
 				2DE2DF320627AE07006BEC99 /* CartFE.cxx */,
 				2DE2DF330627AE07006BEC99 /* CartFE.hxx */,
 				2DE2DF360627AE07006BEC99 /* CartMC.cxx */,
 				2DE2DF370627AE07006BEC99 /* CartMC.hxx */,
+				DC0984830D3985160073C852 /* CartSB.cxx */,
+				DC0984840D3985160073C852 /* CartSB.hxx */,
 				2DDBEB7008457B7D00812C11 /* CartUA.cxx */,
 				2DDBEB7108457B7D00812C11 /* CartUA.hxx */,
+				DCA23AE70D75B22500F77B33 /* CartX07.cxx */,
+				DCA23AE80D75B22500F77B33 /* CartX07.hxx */,
 				2DE2DF380627AE07006BEC99 /* Console.cxx */,
 				2DE2DF390627AE07006BEC99 /* Console.hxx */,
 				2DE2DF3A0627AE07006BEC99 /* Control.cxx */,
 				2DE2DF3B0627AE07006BEC99 /* Control.hxx */,
+				DC932D3F0F278A5200FEFEFC /* DefProps.hxx */,
+				DCECDAF210B9DBDC00AF4E1B /* Device.cxx */,
+				DCECDAF310B9DBDC00AF4E1B /* Device.hxx */,
 				2DE2DF3E0627AE07006BEC99 /* Driving.cxx */,
 				2DE2DF3F0627AE07006BEC99 /* Driving.hxx */,
 				2DE2DF400627AE07006BEC99 /* Event.cxx */,
@@ -1020,16 +998,26 @@
 				2D733D71062895B2006265D9 /* FrameBuffer.hxx */,
 				2DDBEB7208457B7D00812C11 /* FSNode.cxx */,
 				2DDBEB7308457B7D00812C11 /* FSNode.hxx */,
+				DC84E11A1135988E00CA7C9D /* Genesis.cxx */,
+				DC84E11B1135988E00CA7C9D /* Genesis.hxx */,
 				2DE2DF420627AE07006BEC99 /* Joystick.cxx */,
 				2DE2DF430627AE07006BEC99 /* Joystick.hxx */,
 				2DE2DF440627AE07006BEC99 /* Keyboard.cxx */,
 				2DE2DF450627AE07006BEC99 /* Keyboard.hxx */,
+				DC9EA8850F729A36000452B5 /* KidVid.cxx */,
+				DC9EA8860F729A36000452B5 /* KidVid.hxx */,
+				DCECDAF410B9DBDC00AF4E1B /* M6502.cxx */,
+				DCECDAF510B9DBDC00AF4E1B /* M6502.hxx */,
 				2DE2DF7C0627AE33006BEC99 /* M6532.cxx */,
 				2DE2DF7D0627AE33006BEC99 /* M6532.hxx */,
 				2DE2DF7E0627AE33006BEC99 /* MD5.cxx */,
 				2DE2DF7F0627AE34006BEC99 /* MD5.hxx */,
 				2D05FF5A096E261E00A518FE /* MediaFactory.cxx */,
 				2D05FF5B096E261E00A518FE /* MediaFactory.hxx */,
+				DC11F78B0DB36933003B505E /* MT24LC256.cxx */,
+				DC11F78C0DB36933003B505E /* MT24LC256.hxx */,
+				DCECDAF610B9DBDC00AF4E1B /* NullDev.cxx */,
+				DCECDAF710B9DBDC00AF4E1B /* NullDev.hxx */,
 				2DDBEB7408457B7D00812C11 /* OSystem.cxx */,
 				2DDBEB7508457B7D00812C11 /* OSystem.hxx */,
 				2DE2DF820627AE34006BEC99 /* Paddles.cxx */,
@@ -1040,17 +1028,29 @@
 				2DE2DF870627AE34006BEC99 /* PropsSet.hxx */,
 				2DE2DF880627AE34006BEC99 /* Random.cxx */,
 				2DE2DF890627AE34006BEC99 /* Random.hxx */,
+				DC4AC6F10DC8DAEF00CD3AD2 /* SaveKey.cxx */,
+				DC4AC6F20DC8DAEF00CD3AD2 /* SaveKey.hxx */,
+				DC932D400F278A5200FEFEFC /* Serializable.hxx */,
 				2DE2DF8A0627AE34006BEC99 /* Serializer.cxx */,
 				2DE2DF8B0627AE34006BEC99 /* Serializer.hxx */,
-				2D733D77062895F1006265D9 /* Settings.hxx */,
+				DC932D410F278A5200FEFEFC /* SerialPort.hxx */,
 				2D944848062904E800DD9879 /* Settings.cxx */,
+				2D733D77062895F1006265D9 /* Settings.hxx */,
 				2DE2DF8D0627AE34006BEC99 /* Sound.hxx */,
+				DC07A3C60CAD738A009B4BC9 /* StateManager.cxx */,
+				DC07A3C70CAD738A009B4BC9 /* StateManager.hxx */,
 				2DE2DF8E0627AE34006BEC99 /* Switches.cxx */,
 				2DE2DF8F0627AE34006BEC99 /* Switches.hxx */,
+				DCECDAF810B9DBDC00AF4E1B /* System.cxx */,
+				DCECDAF910B9DBDC00AF4E1B /* System.hxx */,
 				2DE2DF900627AE34006BEC99 /* TIA.cxx */,
 				2DE2DF910627AE34006BEC99 /* TIA.hxx */,
 				2DE7242D08CE910900C889A8 /* TIASnd.cxx */,
 				2DE7242E08CE910900C889A8 /* TIASnd.hxx */,
+				DC932D420F278A5200FEFEFC /* TIATables.cxx */,
+				DC932D430F278A5200FEFEFC /* TIATables.hxx */,
+				DCE6EB200DD9ADA00047AC28 /* TrackBall.cxx */,
+				DCE6EB210DD9ADA00047AC28 /* TrackBall.hxx */,
 				2DDBEB7608457B7D00812C11 /* unzip.c */,
 				2DDBEB7708457B7D00812C11 /* unzip.h */,
 			);
@@ -1060,24 +1060,6 @@
 		2D6050FA0898786C00C6DE89 /* gui */ = {
 			isa = PBXGroup;
 			children = (
-				DC5D2C5E0F129B1E004D1660 /* LauncherFilterDialog.cxx */,
-				DC5D2C5F0F129B1E004D1660 /* LauncherFilterDialog.hxx */,
-				DC5D2C4E0F117CFD004D1660 /* Rect.hxx */,
-				DC5D2C4F0F117CFD004D1660 /* StellaFont.hxx */,
-				DC5D2C500F117CFD004D1660 /* StellaLargeFont.hxx */,
-				DC5D2C510F117CFD004D1660 /* StellaMediumFont.hxx */,
-				DC0DF8670F0DAAF500B0F1F3 /* GlobalPropsDialog.cxx */,
-				DC0DF8680F0DAAF500B0F1F3 /* GlobalPropsDialog.hxx */,
-				DC173F740E2CAC1E00320F94 /* ContextMenu.cxx */,
-				DC173F750E2CAC1E00320F94 /* ContextMenu.hxx */,
-				DC4613650D92C03600D8DAB9 /* RomAuditDialog.cxx */,
-				DC4613660D92C03600D8DAB9 /* RomAuditDialog.hxx */,
-				DCE3BBF50C95CEDC00A671DF /* RomInfoWidget.cxx */,
-				DCE3BBF60C95CEDC00A671DF /* RomInfoWidget.hxx */,
-				DC8078E40B4BD697005E9305 /* FileSnapDialog.cxx */,
-				DC8078E50B4BD697005E9305 /* FileSnapDialog.hxx */,
-				DC8078E60B4BD697005E9305 /* UIDialog.cxx */,
-				DC8078E70B4BD697005E9305 /* UIDialog.hxx */,
 				2DDBEAA3084578BF00812C11 /* AboutDialog.cxx */,
 				2DDBEAA4084578BF00812C11 /* AboutDialog.hxx */,
 				2DDBEAA6084578BF00812C11 /* AudioDialog.cxx */,
@@ -1092,6 +1074,8 @@
 				2D73959508C3EB4E0060BB99 /* CommandMenu.cxx */,
 				2D73959608C3EB4E0060BB99 /* CommandMenu.hxx */,
 				2D9217FA0857CC88001D664B /* ConsoleFont.hxx */,
+				DC173F740E2CAC1E00320F94 /* ContextMenu.cxx */,
+				DC173F750E2CAC1E00320F94 /* ContextMenu.hxx */,
 				2DDBEAAB084578BF00812C11 /* Dialog.cxx */,
 				2DDBEAAC084578BF00812C11 /* Dialog.hxx */,
 				2DDBEAAD084578BF00812C11 /* DialogContainer.cxx */,
@@ -1102,12 +1086,16 @@
 				2D403BA5086116D1001E31A1 /* EditTextWidget.hxx */,
 				2D05FF5E096E269100A518FE /* EventMappingWidget.cxx */,
 				2D05FF5F096E269100A518FE /* EventMappingWidget.hxx */,
+				DC8078E40B4BD697005E9305 /* FileSnapDialog.cxx */,
+				DC8078E50B4BD697005E9305 /* FileSnapDialog.hxx */,
 				2D9217FB0857CC88001D664B /* Font.cxx */,
 				2D9217FC0857CC88001D664B /* Font.hxx */,
 				2DDBEAB2084578BF00812C11 /* GameInfoDialog.cxx */,
 				2DDBEAB3084578BF00812C11 /* GameInfoDialog.hxx */,
 				2DDBEAB4084578BF00812C11 /* GameList.cxx */,
 				2DDBEAB5084578BF00812C11 /* GameList.hxx */,
+				DC0DF8670F0DAAF500B0F1F3 /* GlobalPropsDialog.cxx */,
+				DC0DF8680F0DAAF500B0F1F3 /* GlobalPropsDialog.hxx */,
 				2DDBEAB6084578BF00812C11 /* GuiObject.hxx */,
 				2DDBEAB8084578BF00812C11 /* HelpDialog.cxx */,
 				2DDBEAB9084578BF00812C11 /* HelpDialog.hxx */,
@@ -1119,6 +1107,8 @@
 				2DDBEABB084578BF00812C11 /* Launcher.hxx */,
 				2DDBEABC084578BF00812C11 /* LauncherDialog.cxx */,
 				2DDBEABD084578BF00812C11 /* LauncherDialog.hxx */,
+				DC5D2C5E0F129B1E004D1660 /* LauncherFilterDialog.cxx */,
+				DC5D2C5F0F129B1E004D1660 /* LauncherFilterDialog.hxx */,
 				2DDBEAC0084578BF00812C11 /* ListWidget.cxx */,
 				2DDBEAC1084578BF00812C11 /* ListWidget.hxx */,
 				2DDBEAC2084578BF00812C11 /* Menu.cxx */,
@@ -1129,13 +1119,23 @@
 				2DDBEAC7084578BF00812C11 /* PopUpWidget.hxx */,
 				2DDBEAC8084578BF00812C11 /* ProgressDialog.cxx */,
 				2DDBEAC9084578BF00812C11 /* ProgressDialog.hxx */,
+				DC5D2C4E0F117CFD004D1660 /* Rect.hxx */,
+				DC4613650D92C03600D8DAB9 /* RomAuditDialog.cxx */,
+				DC4613660D92C03600D8DAB9 /* RomAuditDialog.hxx */,
+				DCE3BBF50C95CEDC00A671DF /* RomInfoWidget.cxx */,
+				DCE3BBF60C95CEDC00A671DF /* RomInfoWidget.hxx */,
 				2DDBEACA084578BF00812C11 /* ScrollBarWidget.cxx */,
 				2DDBEACB084578BF00812C11 /* ScrollBarWidget.hxx */,
+				DC5D2C4F0F117CFD004D1660 /* StellaFont.hxx */,
+				DC5D2C500F117CFD004D1660 /* StellaLargeFont.hxx */,
+				DC5D2C510F117CFD004D1660 /* StellaMediumFont.hxx */,
 				2DDBEACF084578BF00812C11 /* StringList.hxx */,
 				2DEF21FA08BC033500B246B4 /* StringListWidget.cxx */,
 				2DEF21FB08BC033500B246B4 /* StringListWidget.hxx */,
 				2DDBEAD0084578BF00812C11 /* TabWidget.cxx */,
 				2DDBEAD1084578BF00812C11 /* TabWidget.hxx */,
+				DC8078E60B4BD697005E9305 /* UIDialog.cxx */,
+				DC8078E70B4BD697005E9305 /* UIDialog.hxx */,
 				2DDBEAD2084578BF00812C11 /* VideoDialog.cxx */,
 				2DDBEAD3084578BF00812C11 /* VideoDialog.hxx */,
 				2DDBEAD4084578BF00812C11 /* Widget.cxx */,
@@ -1147,25 +1147,25 @@
 		2D605130089879BA00C6DE89 /* debugger */ = {
 			isa = PBXGroup;
 			children = (
+				2D20F9E308C603C500A73076 /* gui */,
 				DCE9CC261103812700C86671 /* CartDebug.cxx */,
 				DCE9CC271103812700C86671 /* CartDebug.hxx */,
-				DCE9CC281103812700C86671 /* DiStella.cxx */,
-				DCE9CC291103812700C86671 /* DiStella.hxx */,
-				DCA00FF50DBABCAD00C3823D /* RiotDebug.cxx */,
-				DCA00FF60DBABCAD00C3823D /* RiotDebug.hxx */,
-				DC8078DA0B4BD5F3005E9305 /* DebuggerExpressions.hxx */,
-				2D20F9E308C603C500A73076 /* gui */,
 				2D9555DD0880E79600466554 /* CpuDebug.cxx */,
 				2D9555DE0880E79600466554 /* CpuDebug.hxx */,
 				2D659E2D085D3DD6005D96C8 /* Debugger.cxx */,
 				2D659E2E085D3DD6005D96C8 /* Debugger.hxx */,
+				DC8078DA0B4BD5F3005E9305 /* DebuggerExpressions.hxx */,
 				2D659E31085D3DD6005D96C8 /* DebuggerParser.cxx */,
 				2D659E32085D3DD6005D96C8 /* DebuggerParser.hxx */,
 				2DF971D70892CEA400F64D23 /* DebuggerSystem.hxx */,
+				DCE9CC281103812700C86671 /* DiStella.cxx */,
+				DCE9CC291103812700C86671 /* DiStella.hxx */,
 				2DF971DE0892CEA400F64D23 /* Expression.cxx */,
 				2DF971DF0892CEA400F64D23 /* Expression.hxx */,
 				2D403BCE08611A69001E31A1 /* PackedBitArray.cxx */,
 				2D403BCF08611A69001E31A1 /* PackedBitArray.hxx */,
+				DCA00FF50DBABCAD00C3823D /* RiotDebug.cxx */,
+				DCA00FF60DBABCAD00C3823D /* RiotDebug.hxx */,
 				2D30F8750868A4DB00938B9D /* TIADebug.cxx */,
 				2D30F8760868A4DB00938B9D /* TIADebug.hxx */,
 				2D6CC10308C811A600B8F642 /* TiaZoomWidget.cxx */,
diff --git a/src/macosx/stella_intel.xcodeproj/project.pbxproj b/src/macosx/stella_intel.xcodeproj/project.pbxproj
index 7d0f06403..a545343c2 100644
--- a/src/macosx/stella_intel.xcodeproj/project.pbxproj
+++ b/src/macosx/stella_intel.xcodeproj/project.pbxproj
@@ -740,10 +740,10 @@
 			children = (
 				2D1A6CD4085135F9007CDBA8 /* AboutBox.h */,
 				2D1A6CD5085135F9007CDBA8 /* AboutBox.m */,
+				2D62C40E085011050063A4A3 /* Menus.h */,
+				2D47A45208491D4500ABFB6A /* Menus.m */,
 				2DDBEBE3084582C400812C11 /* Preferences.h */,
 				2DDBEBE4084582C400812C11 /* Preferences.m */,
-				2D47A45208491D4500ABFB6A /* Menus.m */,
-				2D62C40E085011050063A4A3 /* Menus.h */,
 				F5A47A9D01A0482F01D3D55B /* SDLMain.h */,
 				F5A47A9E01A0483001D3D55B /* SDLMain.m */,
 			);
@@ -832,8 +832,6 @@
 		2D20F9E308C603C500A73076 /* gui */ = {
 			isa = PBXGroup;
 			children = (
-				DC4AC6ED0DC8DACB00CD3AD2 /* RiotWidget.cxx */,
-				DC4AC6EE0DC8DACB00CD3AD2 /* RiotWidget.hxx */,
 				2D23318F0900B5EF00613B1F /* AudioWidget.cxx */,
 				2D2331900900B5EF00613B1F /* AudioWidget.hxx */,
 				2D20F9E408C603EC00A73076 /* ColorWidget.cxx */,
@@ -850,6 +848,8 @@
 				2D20F9EF08C603EC00A73076 /* PromptWidget.hxx */,
 				2D20F9F008C603EC00A73076 /* RamWidget.cxx */,
 				2D20F9F108C603EC00A73076 /* RamWidget.hxx */,
+				DC4AC6ED0DC8DACB00CD3AD2 /* RiotWidget.cxx */,
+				DC4AC6EE0DC8DACB00CD3AD2 /* RiotWidget.hxx */,
 				2D20F9F208C603EC00A73076 /* RomListWidget.cxx */,
 				2D20F9F308C603EC00A73076 /* RomListWidget.hxx */,
 				2D20F9F408C603EC00A73076 /* RomWidget.cxx */,
@@ -873,25 +873,25 @@
 		2D6050C5089876F300C6DE89 /* common */ = {
 			isa = PBXGroup;
 			children = (
-				DCC527D810B9DA6A005E1287 /* bspf.hxx */,
-				DCC527D910B9DA6A005E1287 /* Snapshot.cxx */,
-				DCC527DA10B9DA6A005E1287 /* Snapshot.hxx */,
-				DC5D1AA6102C6FC900E59AC1 /* Stack.hxx */,
-				DCB9DA5E0FCD527000B192F6 /* GLShaderProgs.hxx */,
-				DCF467BC0F9399F500B25D7A /* Version.hxx */,
 				DCF467B10F93993B00B25D7A /* Array.hxx */,
-				DCF467B20F93993B00B25D7A /* SharedPtr.hxx */,
-				DCF467B30F93993B00B25D7A /* SoundNull.cxx */,
-				DCF467B40F93993B00B25D7A /* SoundNull.hxx */,
-				DCD56D3A0B247DB40092F9F8 /* RectList.cxx */,
-				DCD56D3B0B247DB40092F9F8 /* RectList.hxx */,
+				DCC527D810B9DA6A005E1287 /* bspf.hxx */,
 				2D733D5D062893E7006265D9 /* FrameBufferGL.cxx */,
 				2D733D5E062893E7006265D9 /* FrameBufferGL.hxx */,
 				2D733D61062893E7006265D9 /* FrameBufferSoft.cxx */,
 				2D733D62062893E7006265D9 /* FrameBufferSoft.hxx */,
+				DCB9DA5E0FCD527000B192F6 /* GLShaderProgs.hxx */,
 				2DDBEA0A0845700300812C11 /* mainSDL.cxx */,
+				DCD56D3A0B247DB40092F9F8 /* RectList.cxx */,
+				DCD56D3B0B247DB40092F9F8 /* RectList.hxx */,
+				DCF467B20F93993B00B25D7A /* SharedPtr.hxx */,
+				DCC527D910B9DA6A005E1287 /* Snapshot.cxx */,
+				DCC527DA10B9DA6A005E1287 /* Snapshot.hxx */,
+				DCF467B30F93993B00B25D7A /* SoundNull.cxx */,
+				DCF467B40F93993B00B25D7A /* SoundNull.hxx */,
 				2DDA34020665817D00CDD299 /* SoundSDL.cxx */,
 				2DDA34030665817D00CDD299 /* SoundSDL.hxx */,
+				DC5D1AA6102C6FC900E59AC1 /* Stack.hxx */,
+				DCF467BC0F9399F500B25D7A /* Version.hxx */,
 			);
 			name = common;
 			sourceTree = "<group>";
@@ -899,13 +899,13 @@
 		2D6050C60898771C00C6DE89 /* macosx */ = {
 			isa = PBXGroup;
 			children = (
-				DC1FC1880DB3B2C7009B3DF7 /* SerialPortMACOSX.cxx */,
-				DC1FC1890DB3B2C7009B3DF7 /* SerialPortMACOSX.hxx */,
+				2D28DDE409DC2D9F00A17585 /* MenusEvents.h */,
 				2DDBEA0E0845709700812C11 /* OSystemMACOSX.cxx */,
 				2DDBEA0F0845709700812C11 /* OSystemMACOSX.hxx */,
+				DC1FC1880DB3B2C7009B3DF7 /* SerialPortMACOSX.cxx */,
+				DC1FC1890DB3B2C7009B3DF7 /* SerialPortMACOSX.hxx */,
 				2D944866062911CD00DD9879 /* SettingsMACOSX.cxx */,
 				2D94486C0629124700DD9879 /* SettingsMACOSX.hxx */,
-				2D28DDE409DC2D9F00A17585 /* MenusEvents.h */,
 			);
 			name = macosx;
 			sourceTree = "<group>";
@@ -921,59 +921,22 @@
 		2D6050CC0898776500C6DE89 /* emucore */ = {
 			isa = PBXGroup;
 			children = (
-				DCAD60A61152F8BD00BC4184 /* CartDPCPlus.cxx */,
-				DCAD60A71152F8BD00BC4184 /* CartDPCPlus.hxx */,
-				DCD3F7C311340AAF00DBA3AE /* Genesis.cxx */,
-				DCD3F7C411340AAF00DBA3AE /* Genesis.hxx */,
-				DCC527C810B9DA19005E1287 /* Device.cxx */,
-				DCC527C910B9DA19005E1287 /* Device.hxx */,
-				DCC527CA10B9DA19005E1287 /* M6502.cxx */,
-				DCC527CB10B9DA19005E1287 /* M6502.hxx */,
-				DCC527CC10B9DA19005E1287 /* NullDev.cxx */,
-				DCC527CD10B9DA19005E1287 /* NullDev.hxx */,
-				DCC527CE10B9DA19005E1287 /* System.cxx */,
-				DCC527CF10B9DA19005E1287 /* System.hxx */,
-				DCF7B0D910A762FC007A2870 /* CartF0.cxx */,
-				DCF7B0DA10A762FC007A2870 /* CartF0.hxx */,
-				DCF7B0DB10A762FC007A2870 /* CartFA.cxx */,
-				DCF7B0DC10A762FC007A2870 /* CartFA.hxx */,
-				DCF467BE0F939A1400B25D7A /* CartEF.cxx */,
-				DCF467BF0F939A1400B25D7A /* CartEF.hxx */,
-				DCF467C00F939A1400B25D7A /* CartEFSC.cxx */,
-				DCF467C10F939A1400B25D7A /* CartEFSC.hxx */,
-				DC9EA8850F729A36000452B5 /* KidVid.cxx */,
-				DC9EA8860F729A36000452B5 /* KidVid.hxx */,
-				DC932D3F0F278A5200FEFEFC /* DefProps.hxx */,
-				DC932D400F278A5200FEFEFC /* Serializable.hxx */,
-				DC932D410F278A5200FEFEFC /* SerialPort.hxx */,
-				DC932D420F278A5200FEFEFC /* TIATables.cxx */,
-				DC932D430F278A5200FEFEFC /* TIATables.hxx */,
-				DCE6EB200DD9ADA00047AC28 /* TrackBall.cxx */,
-				DCE6EB210DD9ADA00047AC28 /* TrackBall.hxx */,
-				DC4AC6F10DC8DAEF00CD3AD2 /* SaveKey.cxx */,
-				DC4AC6F20DC8DAEF00CD3AD2 /* SaveKey.hxx */,
-				DC11F78B0DB36933003B505E /* MT24LC256.cxx */,
-				DC11F78C0DB36933003B505E /* MT24LC256.hxx */,
 				DC487FB40DA5350900E12499 /* AtariVox.cxx */,
 				DC487FB50DA5350900E12499 /* AtariVox.hxx */,
-				DCA23AE70D75B22500F77B33 /* CartX07.cxx */,
-				DCA23AE80D75B22500F77B33 /* CartX07.hxx */,
-				DC0984830D3985160073C852 /* CartSB.cxx */,
-				DC0984840D3985160073C852 /* CartSB.hxx */,
-				DC07A3C60CAD738A009B4BC9 /* StateManager.cxx */,
-				DC07A3C70CAD738A009B4BC9 /* StateManager.hxx */,
-				DCEECE540B5E5E540021D754 /* Cart0840.cxx */,
-				DCEECE550B5E5E540021D754 /* Cart0840.hxx */,
-				DCD56D360B247D920092F9F8 /* Cart4A50.cxx */,
-				DCD56D370B247D920092F9F8 /* Cart4A50.hxx */,
 				2DE2DF100627AE07006BEC99 /* Booster.cxx */,
 				2DE2DF110627AE07006BEC99 /* Booster.hxx */,
 				2DE2DF120627AE07006BEC99 /* Cart.cxx */,
 				2DE2DF130627AE07006BEC99 /* Cart.hxx */,
+				DCEECE540B5E5E540021D754 /* Cart0840.cxx */,
+				DCEECE550B5E5E540021D754 /* Cart0840.hxx */,
 				2DE2DF140627AE07006BEC99 /* Cart2K.cxx */,
 				2DE2DF150627AE07006BEC99 /* Cart2K.hxx */,
+				2D9555D90880E78000466554 /* Cart3E.cxx */,
+				2D9555DA0880E78000466554 /* Cart3E.hxx */,
 				2DE2DF160627AE07006BEC99 /* Cart3F.cxx */,
 				2DE2DF170627AE07006BEC99 /* Cart3F.hxx */,
+				DCD56D360B247D920092F9F8 /* Cart4A50.cxx */,
+				DCD56D370B247D920092F9F8 /* Cart4A50.hxx */,
 				2DE2DF180627AE07006BEC99 /* Cart4K.cxx */,
 				2DE2DF190627AE07006BEC99 /* Cart4K.hxx */,
 				2DE2DF1A0627AE07006BEC99 /* CartAR.cxx */,
@@ -982,12 +945,18 @@
 				2DE2DF1D0627AE07006BEC99 /* CartCV.hxx */,
 				2DE2DF1E0627AE07006BEC99 /* CartDPC.cxx */,
 				2DE2DF1F0627AE07006BEC99 /* CartDPC.hxx */,
+				DCAD60A61152F8BD00BC4184 /* CartDPCPlus.cxx */,
+				DCAD60A71152F8BD00BC4184 /* CartDPCPlus.hxx */,
 				2DE2DF200627AE07006BEC99 /* CartE0.cxx */,
 				2DE2DF210627AE07006BEC99 /* CartE0.hxx */,
-				2D9555D90880E78000466554 /* Cart3E.cxx */,
-				2D9555DA0880E78000466554 /* Cart3E.hxx */,
 				2DE2DF220627AE07006BEC99 /* CartE7.cxx */,
 				2DE2DF230627AE07006BEC99 /* CartE7.hxx */,
+				DCF467BE0F939A1400B25D7A /* CartEF.cxx */,
+				DCF467BF0F939A1400B25D7A /* CartEF.hxx */,
+				DCF467C00F939A1400B25D7A /* CartEFSC.cxx */,
+				DCF467C10F939A1400B25D7A /* CartEFSC.hxx */,
+				DCF7B0D910A762FC007A2870 /* CartF0.cxx */,
+				DCF7B0DA10A762FC007A2870 /* CartF0.hxx */,
 				2DE2DF240627AE07006BEC99 /* CartF4.cxx */,
 				2DE2DF250627AE07006BEC99 /* CartF4.hxx */,
 				2DE2DF260627AE07006BEC99 /* CartF4SC.cxx */,
@@ -1000,16 +969,25 @@
 				2DE2DF2D0627AE07006BEC99 /* CartF8.hxx */,
 				2DE2DF2E0627AE07006BEC99 /* CartF8SC.cxx */,
 				2DE2DF2F0627AE07006BEC99 /* CartF8SC.hxx */,
+				DCF7B0DB10A762FC007A2870 /* CartFA.cxx */,
+				DCF7B0DC10A762FC007A2870 /* CartFA.hxx */,
 				2DE2DF320627AE07006BEC99 /* CartFE.cxx */,
 				2DE2DF330627AE07006BEC99 /* CartFE.hxx */,
 				2DE2DF360627AE07006BEC99 /* CartMC.cxx */,
 				2DE2DF370627AE07006BEC99 /* CartMC.hxx */,
+				DC0984830D3985160073C852 /* CartSB.cxx */,
+				DC0984840D3985160073C852 /* CartSB.hxx */,
 				2DDBEB7008457B7D00812C11 /* CartUA.cxx */,
 				2DDBEB7108457B7D00812C11 /* CartUA.hxx */,
+				DCA23AE70D75B22500F77B33 /* CartX07.cxx */,
+				DCA23AE80D75B22500F77B33 /* CartX07.hxx */,
 				2DE2DF380627AE07006BEC99 /* Console.cxx */,
 				2DE2DF390627AE07006BEC99 /* Console.hxx */,
 				2DE2DF3A0627AE07006BEC99 /* Control.cxx */,
 				2DE2DF3B0627AE07006BEC99 /* Control.hxx */,
+				DC932D3F0F278A5200FEFEFC /* DefProps.hxx */,
+				DCC527C810B9DA19005E1287 /* Device.cxx */,
+				DCC527C910B9DA19005E1287 /* Device.hxx */,
 				2DE2DF3E0627AE07006BEC99 /* Driving.cxx */,
 				2DE2DF3F0627AE07006BEC99 /* Driving.hxx */,
 				2DE2DF400627AE07006BEC99 /* Event.cxx */,
@@ -1020,16 +998,26 @@
 				2D733D71062895B2006265D9 /* FrameBuffer.hxx */,
 				2DDBEB7208457B7D00812C11 /* FSNode.cxx */,
 				2DDBEB7308457B7D00812C11 /* FSNode.hxx */,
+				DCD3F7C311340AAF00DBA3AE /* Genesis.cxx */,
+				DCD3F7C411340AAF00DBA3AE /* Genesis.hxx */,
 				2DE2DF420627AE07006BEC99 /* Joystick.cxx */,
 				2DE2DF430627AE07006BEC99 /* Joystick.hxx */,
 				2DE2DF440627AE07006BEC99 /* Keyboard.cxx */,
 				2DE2DF450627AE07006BEC99 /* Keyboard.hxx */,
+				DC9EA8850F729A36000452B5 /* KidVid.cxx */,
+				DC9EA8860F729A36000452B5 /* KidVid.hxx */,
+				DCC527CA10B9DA19005E1287 /* M6502.cxx */,
+				DCC527CB10B9DA19005E1287 /* M6502.hxx */,
 				2DE2DF7C0627AE33006BEC99 /* M6532.cxx */,
 				2DE2DF7D0627AE33006BEC99 /* M6532.hxx */,
 				2DE2DF7E0627AE33006BEC99 /* MD5.cxx */,
 				2DE2DF7F0627AE34006BEC99 /* MD5.hxx */,
 				2D05FF5A096E261E00A518FE /* MediaFactory.cxx */,
 				2D05FF5B096E261E00A518FE /* MediaFactory.hxx */,
+				DC11F78B0DB36933003B505E /* MT24LC256.cxx */,
+				DC11F78C0DB36933003B505E /* MT24LC256.hxx */,
+				DCC527CC10B9DA19005E1287 /* NullDev.cxx */,
+				DCC527CD10B9DA19005E1287 /* NullDev.hxx */,
 				2DDBEB7408457B7D00812C11 /* OSystem.cxx */,
 				2DDBEB7508457B7D00812C11 /* OSystem.hxx */,
 				2DE2DF820627AE34006BEC99 /* Paddles.cxx */,
@@ -1040,17 +1028,29 @@
 				2DE2DF870627AE34006BEC99 /* PropsSet.hxx */,
 				2DE2DF880627AE34006BEC99 /* Random.cxx */,
 				2DE2DF890627AE34006BEC99 /* Random.hxx */,
+				DC4AC6F10DC8DAEF00CD3AD2 /* SaveKey.cxx */,
+				DC4AC6F20DC8DAEF00CD3AD2 /* SaveKey.hxx */,
+				DC932D400F278A5200FEFEFC /* Serializable.hxx */,
 				2DE2DF8A0627AE34006BEC99 /* Serializer.cxx */,
 				2DE2DF8B0627AE34006BEC99 /* Serializer.hxx */,
-				2D733D77062895F1006265D9 /* Settings.hxx */,
+				DC932D410F278A5200FEFEFC /* SerialPort.hxx */,
 				2D944848062904E800DD9879 /* Settings.cxx */,
+				2D733D77062895F1006265D9 /* Settings.hxx */,
 				2DE2DF8D0627AE34006BEC99 /* Sound.hxx */,
+				DC07A3C60CAD738A009B4BC9 /* StateManager.cxx */,
+				DC07A3C70CAD738A009B4BC9 /* StateManager.hxx */,
 				2DE2DF8E0627AE34006BEC99 /* Switches.cxx */,
 				2DE2DF8F0627AE34006BEC99 /* Switches.hxx */,
+				DCC527CE10B9DA19005E1287 /* System.cxx */,
+				DCC527CF10B9DA19005E1287 /* System.hxx */,
 				2DE2DF900627AE34006BEC99 /* TIA.cxx */,
 				2DE2DF910627AE34006BEC99 /* TIA.hxx */,
 				2DE7242D08CE910900C889A8 /* TIASnd.cxx */,
 				2DE7242E08CE910900C889A8 /* TIASnd.hxx */,
+				DC932D420F278A5200FEFEFC /* TIATables.cxx */,
+				DC932D430F278A5200FEFEFC /* TIATables.hxx */,
+				DCE6EB200DD9ADA00047AC28 /* TrackBall.cxx */,
+				DCE6EB210DD9ADA00047AC28 /* TrackBall.hxx */,
 				2DDBEB7608457B7D00812C11 /* unzip.c */,
 				2DDBEB7708457B7D00812C11 /* unzip.h */,
 			);
@@ -1060,24 +1060,6 @@
 		2D6050FA0898786C00C6DE89 /* gui */ = {
 			isa = PBXGroup;
 			children = (
-				DC5D2C5E0F129B1E004D1660 /* LauncherFilterDialog.cxx */,
-				DC5D2C5F0F129B1E004D1660 /* LauncherFilterDialog.hxx */,
-				DC5D2C4E0F117CFD004D1660 /* Rect.hxx */,
-				DC5D2C4F0F117CFD004D1660 /* StellaFont.hxx */,
-				DC5D2C500F117CFD004D1660 /* StellaLargeFont.hxx */,
-				DC5D2C510F117CFD004D1660 /* StellaMediumFont.hxx */,
-				DC0DF8670F0DAAF500B0F1F3 /* GlobalPropsDialog.cxx */,
-				DC0DF8680F0DAAF500B0F1F3 /* GlobalPropsDialog.hxx */,
-				DC173F740E2CAC1E00320F94 /* ContextMenu.cxx */,
-				DC173F750E2CAC1E00320F94 /* ContextMenu.hxx */,
-				DC4613650D92C03600D8DAB9 /* RomAuditDialog.cxx */,
-				DC4613660D92C03600D8DAB9 /* RomAuditDialog.hxx */,
-				DCE3BBF50C95CEDC00A671DF /* RomInfoWidget.cxx */,
-				DCE3BBF60C95CEDC00A671DF /* RomInfoWidget.hxx */,
-				DC8078E40B4BD697005E9305 /* FileSnapDialog.cxx */,
-				DC8078E50B4BD697005E9305 /* FileSnapDialog.hxx */,
-				DC8078E60B4BD697005E9305 /* UIDialog.cxx */,
-				DC8078E70B4BD697005E9305 /* UIDialog.hxx */,
 				2DDBEAA3084578BF00812C11 /* AboutDialog.cxx */,
 				2DDBEAA4084578BF00812C11 /* AboutDialog.hxx */,
 				2DDBEAA6084578BF00812C11 /* AudioDialog.cxx */,
@@ -1092,6 +1074,8 @@
 				2D73959508C3EB4E0060BB99 /* CommandMenu.cxx */,
 				2D73959608C3EB4E0060BB99 /* CommandMenu.hxx */,
 				2D9217FA0857CC88001D664B /* ConsoleFont.hxx */,
+				DC173F740E2CAC1E00320F94 /* ContextMenu.cxx */,
+				DC173F750E2CAC1E00320F94 /* ContextMenu.hxx */,
 				2DDBEAAB084578BF00812C11 /* Dialog.cxx */,
 				2DDBEAAC084578BF00812C11 /* Dialog.hxx */,
 				2DDBEAAD084578BF00812C11 /* DialogContainer.cxx */,
@@ -1102,12 +1086,16 @@
 				2D403BA5086116D1001E31A1 /* EditTextWidget.hxx */,
 				2D05FF5E096E269100A518FE /* EventMappingWidget.cxx */,
 				2D05FF5F096E269100A518FE /* EventMappingWidget.hxx */,
+				DC8078E40B4BD697005E9305 /* FileSnapDialog.cxx */,
+				DC8078E50B4BD697005E9305 /* FileSnapDialog.hxx */,
 				2D9217FB0857CC88001D664B /* Font.cxx */,
 				2D9217FC0857CC88001D664B /* Font.hxx */,
 				2DDBEAB2084578BF00812C11 /* GameInfoDialog.cxx */,
 				2DDBEAB3084578BF00812C11 /* GameInfoDialog.hxx */,
 				2DDBEAB4084578BF00812C11 /* GameList.cxx */,
 				2DDBEAB5084578BF00812C11 /* GameList.hxx */,
+				DC0DF8670F0DAAF500B0F1F3 /* GlobalPropsDialog.cxx */,
+				DC0DF8680F0DAAF500B0F1F3 /* GlobalPropsDialog.hxx */,
 				2DDBEAB6084578BF00812C11 /* GuiObject.hxx */,
 				2DDBEAB8084578BF00812C11 /* HelpDialog.cxx */,
 				2DDBEAB9084578BF00812C11 /* HelpDialog.hxx */,
@@ -1119,6 +1107,8 @@
 				2DDBEABB084578BF00812C11 /* Launcher.hxx */,
 				2DDBEABC084578BF00812C11 /* LauncherDialog.cxx */,
 				2DDBEABD084578BF00812C11 /* LauncherDialog.hxx */,
+				DC5D2C5E0F129B1E004D1660 /* LauncherFilterDialog.cxx */,
+				DC5D2C5F0F129B1E004D1660 /* LauncherFilterDialog.hxx */,
 				2DDBEAC0084578BF00812C11 /* ListWidget.cxx */,
 				2DDBEAC1084578BF00812C11 /* ListWidget.hxx */,
 				2DDBEAC2084578BF00812C11 /* Menu.cxx */,
@@ -1129,13 +1119,23 @@
 				2DDBEAC7084578BF00812C11 /* PopUpWidget.hxx */,
 				2DDBEAC8084578BF00812C11 /* ProgressDialog.cxx */,
 				2DDBEAC9084578BF00812C11 /* ProgressDialog.hxx */,
+				DC5D2C4E0F117CFD004D1660 /* Rect.hxx */,
+				DC4613650D92C03600D8DAB9 /* RomAuditDialog.cxx */,
+				DC4613660D92C03600D8DAB9 /* RomAuditDialog.hxx */,
+				DCE3BBF50C95CEDC00A671DF /* RomInfoWidget.cxx */,
+				DCE3BBF60C95CEDC00A671DF /* RomInfoWidget.hxx */,
 				2DDBEACA084578BF00812C11 /* ScrollBarWidget.cxx */,
 				2DDBEACB084578BF00812C11 /* ScrollBarWidget.hxx */,
+				DC5D2C4F0F117CFD004D1660 /* StellaFont.hxx */,
+				DC5D2C500F117CFD004D1660 /* StellaLargeFont.hxx */,
+				DC5D2C510F117CFD004D1660 /* StellaMediumFont.hxx */,
 				2DDBEACF084578BF00812C11 /* StringList.hxx */,
 				2DEF21FA08BC033500B246B4 /* StringListWidget.cxx */,
 				2DEF21FB08BC033500B246B4 /* StringListWidget.hxx */,
 				2DDBEAD0084578BF00812C11 /* TabWidget.cxx */,
 				2DDBEAD1084578BF00812C11 /* TabWidget.hxx */,
+				DC8078E60B4BD697005E9305 /* UIDialog.cxx */,
+				DC8078E70B4BD697005E9305 /* UIDialog.hxx */,
 				2DDBEAD2084578BF00812C11 /* VideoDialog.cxx */,
 				2DDBEAD3084578BF00812C11 /* VideoDialog.hxx */,
 				2DDBEAD4084578BF00812C11 /* Widget.cxx */,
@@ -1147,25 +1147,25 @@
 		2D605130089879BA00C6DE89 /* debugger */ = {
 			isa = PBXGroup;
 			children = (
+				2D20F9E308C603C500A73076 /* gui */,
 				DC6B2BA011037FF200F199A7 /* CartDebug.cxx */,
 				DC6B2BA111037FF200F199A7 /* CartDebug.hxx */,
-				DC6B2BA211037FF200F199A7 /* DiStella.cxx */,
-				DC6B2BA311037FF200F199A7 /* DiStella.hxx */,
-				DCA00FF50DBABCAD00C3823D /* RiotDebug.cxx */,
-				DCA00FF60DBABCAD00C3823D /* RiotDebug.hxx */,
-				DC8078DA0B4BD5F3005E9305 /* DebuggerExpressions.hxx */,
-				2D20F9E308C603C500A73076 /* gui */,
 				2D9555DD0880E79600466554 /* CpuDebug.cxx */,
 				2D9555DE0880E79600466554 /* CpuDebug.hxx */,
 				2D659E2D085D3DD6005D96C8 /* Debugger.cxx */,
 				2D659E2E085D3DD6005D96C8 /* Debugger.hxx */,
+				DC8078DA0B4BD5F3005E9305 /* DebuggerExpressions.hxx */,
 				2D659E31085D3DD6005D96C8 /* DebuggerParser.cxx */,
 				2D659E32085D3DD6005D96C8 /* DebuggerParser.hxx */,
 				2DF971D70892CEA400F64D23 /* DebuggerSystem.hxx */,
+				DC6B2BA211037FF200F199A7 /* DiStella.cxx */,
+				DC6B2BA311037FF200F199A7 /* DiStella.hxx */,
 				2DF971DE0892CEA400F64D23 /* Expression.cxx */,
 				2DF971DF0892CEA400F64D23 /* Expression.hxx */,
 				2D403BCE08611A69001E31A1 /* PackedBitArray.cxx */,
 				2D403BCF08611A69001E31A1 /* PackedBitArray.hxx */,
+				DCA00FF50DBABCAD00C3823D /* RiotDebug.cxx */,
+				DCA00FF60DBABCAD00C3823D /* RiotDebug.hxx */,
 				2D30F8750868A4DB00938B9D /* TIADebug.cxx */,
 				2D30F8760868A4DB00938B9D /* TIADebug.hxx */,
 				2D6CC10308C811A600B8F642 /* TiaZoomWidget.cxx */,