diff --git a/.gitignore b/.gitignore
index eae6d8e..46cd61b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,7 @@
 
 # Private data
 /private
+/symbols/*private
+
+# FxOS shell history
+.fxos_history
diff --git a/fxosrc b/fxosrc
index 5bdec47..e030598 100644
--- a/fxosrc
+++ b/fxosrc
@@ -8,5 +8,22 @@
 vc cg_3.60
 . "/targets/cg_3.60"
 
+vc cg_3.00
+. "/targets/cg_3.00"
+
+vc cgemu_2.00
+. "/targets/cgemu_2.00"
+
+vc cg_2.00
+. "/targets/cg_2.00"
+
+vc cg_1.01
+. "/targets/cg_1.01"
+
+vc cg_1.00
+. "/targets/cg_1.00"
+
 # Default to cg_3.60
 vs cg_3.60
+
+ads
diff --git a/symbols/syscalls_cg b/symbols/syscalls_cg
index 61dfe37..692d02d 100644
--- a/symbols/syscalls_cg
+++ b/symbols/syscalls_cg
@@ -1,2 +1,3 @@
+. "syscalls_cg_private"
 . "syscalls_cg_dr_carlos"
 . "syscalls_cg_simlo"
diff --git a/symbols/syscalls_cg_dr_carlos b/symbols/syscalls_cg_dr_carlos
index 1b2db4f..75b3d43 100644
--- a/symbols/syscalls_cg_dr_carlos
+++ b/symbols/syscalls_cg_dr_carlos
@@ -1,14 +1,20 @@
 ms %0000 ClearHourGlass
 ms %0001 HourGlass1
+ms %0018 Syscall19_ReturnA
 ms %001A Bfile_GetFilenameAtOffset
 ms %001B GetValueAtFD8019C8
-ms %0020 GetMainMenuTotal
+ms %001D CountAddinsLoaded
+ms %001E GetLoadedAddinInfo
+ms %0020 CountAddinsLoadedMinusOne
 ms %002A SetAddresses
 ms %0031 GetSetupSetting
 ms %0032 SetSetupSetting
 ms %0040 Print_Amortization
 ms %0111 Bkey_ClrAllFlags
 ms %0112 Bkey_SetFlag
+ms %0121 Syscall11F_NoAction
+ms %0126 Syscall11F_Action1
+ms %0127 Syscall11F_Action3
 ms %0160 BCDtoInternal
 ms %0185 GetSetupSetting62
 ms %0186 GetSetupSetting64
@@ -23,6 +29,7 @@ ms %01AE Bdisp_SetPoint_VRAM_DD_WB2
 ms %01B0 Bdisp_GetPoint_VRAM_WB2
 ms %01B1 Bdisp_SetPoint_VRAM_WB_C32
 ms %01B7 Bdisp_AreaClr_VRAM_WB_x3
+ms %01B8 Syscall1BC_x3
 ms %01BC Bdisp_AreaClr_VRAMDD_WB
 ms %01BD Bdisp_ShapeBase3XDD
 ms %01BE Bdisp_ShapeBase3XVRAM
@@ -42,6 +49,8 @@ ms %01DA Bdisp_LineC3DD_Draw
 ms %01DB Bdisp_LineC3DD_Draw2
 ms %01DC Bdisp_Line_Clear
 ms %01DD Bdisp_LineDD_Clear
+ms %01DF Syscall1DE_Clear
+ms %01E0 Syscall1DE_Set
 ms %01EE GetPrintCXYPos
 ms %01EF GetPrintMiniPos
 ms %01F0 GetPrintMiniMiniPos
@@ -146,6 +155,7 @@ ms %0294 Bdisp_WriteGraphDD_WB
 ms %0295 Bdisp_WriteGraphVRAM_DD_WB
 ms %02B0 Bdisp_WriteGraph_C3
 ms %02B1 Bdisp_WriteGraph_WB
+ms %02B7 SetStatusAreaEnabled
 ms %02C8 DoNothing2
 ms %02C9 DoNothing3
 ms %07ED Zero3
@@ -159,6 +169,11 @@ ms %08C2 Get8C3Flash
 ms %08C3 CursorGetSettings8C3
 ms %08F2 Print_Days_Calculation
 ms %0914 Print_Depreciation
+ms %091E Bdisp_FrameAndColor
+ms %091F Bdisp_SetWhiteFrameC3
+ms %0920 Bdisp_SetFrameAndColor
+ms %0921 Bdisp_SetWhiteFrame
+ms %0B02 APP_E_CON4
 ms %0B03 DoNothing5
 ms %0B04 DoNothing6
 ms %0B53 Zero8
@@ -180,6 +195,16 @@ ms %0BCE Zero15
 ms %0DEB Zero16
 ms %0E27 Zero17
 ms %0E51 Zero18
+ms %0E96 PRGMToGetKey1
+ms %0E97 PRGMToGetKey2
+ms %0E98 PRGMToGetKey1_Current
+ms %0E99 PRGMToGetKey2_Current
+ms %0EA7 TestMode
+ms %0EA8 Keyboard_PutGetKey
+ms %0EAA GetKey_OS_4
+ms %0EAB GetKey_Normal
+ms %0EAC GetKey_OS_Info
+ms %0EAD GetKey_OS
 ms %0ED3 Zero19
 ms %0FA1 Zero1A
 ms %0FA2 Zero1B
@@ -200,12 +225,14 @@ ms %11B6 DoNothing13
 ms %11D5 DoNothing14
 ms %125B Zero1F
 ms %125C DoNothing15
+ms %125E SixtyFour
 ms %125F Zero20
 ms %1262 DoNothing16
 ms %1264 DoNothing17
 ms %1268 DoNothing18
 ms %126F Zero21
 ms %1270 DoNothing19
+ms %1274 Negative33
 ms %1278 DoNothing1A
 ms %1279 DoNothing1B
 ms %1298 DoNothing1C
@@ -215,8 +242,11 @@ ms %129F Zero23
 ms %12A1 Zero24
 ms %12AA Zero25
 ms %12AF Zero26
+ms %12B7 ShouldOpenDiagnosticMenu
+ms %12B8 ShouldOpenInitializeAllMenu
 ms %12BC DoNothing1E
 ms %12BD Zero27
+ms %12C0 GetKeyWait_OS
 ms %12D3 UpdateBatteryState
 ms %1342 Zero28
 ms %1372 Zero29
@@ -230,6 +260,7 @@ ms %16F3 DoNothing22
 ms %16F7 Zero2C
 ms %1747 Zero2D
 ms %1835 Zero2E
+ms %1839 PowerOff_OS
 ms %1842 DoNothing23
 ms %1843 One
 ms %1900 Bdisp_WriteSystemMessageCharNormal
@@ -237,22 +268,40 @@ ms %1905 Bdisp_WriteSystemMessageNormal
 ms %19F9 Zero2F
 ms %19FA Zero30
 ms %1A36 SetKeyboardInputMode
+ms %1A37 GetKeyboardInputMode
+ms %1A38 ClrKeyboardInputMode
 ms %1A59 Print_Simple_Interest
 ms %1A67 DoNothing24
+ms %1B0F APP_SSHEET
+ms %1D72 EnableStatusArea
 ms %1D7F GetKeyShowStatusBar
 ms %1D80 SetGetKeyShowStatusBar
 ms %1D9A Zero31
+ms %1D9C EmuSixtyFour
 ms %1DA0 Zero32
 ms %1DC0 Zero33
 ms %1DC1 Zero34
 ms %1DC2 Zero35
 ms %1E19 DoNothing25
+ms %1E58 SwitchToMainMenu
+ms %1E5B OpenAddin
+ms %1E6A DisplayMainMenu
+ms %1E70 GetLowBatteryState
+ms %1E71 IsLowBattery
+ms %1E72 IsLowBattery_NoDelay
+ms %1E74 BatteryCheck_Delay
+ms %1E75 TriggerBatteryLowMessage
 ms %1E98 Zero36
+ms %1E9C IsEACTOpen
+ms %1E9E SetAppName
+ms %1EA1 GetSpecialMatrixMainFunctionReturnFlag
 ms %1EA6 EnableGetKeytoMainFunctionReturn
 ms %1EA7 DisableGetKeytoMainFunctionReturn
 ms %1EA8 DoNothing26
+ms %1ED5 OS_InnerWait
 ms %1EE5 DoNothing27
 ms %1EE6 DoNothing28
+ms %1F55 GetKey
 
 ms 0x800506dc Print_OSC16
 ms 0x800507d4 Print_OSC16_Char
@@ -264,8 +313,38 @@ ms 0x8c04fb3a CursorFlashMode
 ms 0x8c090c1e BatteryState
 ms 0x8c0a3041 GetkeyToMainFunctionReturnFlag
 ms 0x8c0a3042 GetkeyToMainFunctionReturnFlagDefault
+ms 0x8c0a3043 SpecialMatrixMainFunctionReturnFlag
 ms 0x8c0cb878 LoadedAddins
 ms 0xfd8019bc HourGlassTime
 ms 0xfd8019c0 HourGlassBitmapNumber
 ms 0xfd801a34 CursorSetting5
 ms 0xfd802148 GetKeyShowStatusBar
+ms 0x805ff144 PRGMGetKeyCodes1_Normal
+ms 0x805ff420 PRGMGetKeyCodes2_Normal
+ms 0x805ff238 PRGMGetKeyCodes1_Alpha
+ms 0x805ff514 PRGMGetKeyCodes2_Alpha
+ms 0x805ff32c PRGMGetKeyCodes1_Shift
+ms 0x805ff608 PRGMGetKeyCodes2_Shift
+ms 0x805ff6fc PRGMGetKeyCodes2_Clip
+ms 0x801952bc GetKey_Internal
+ms 0x801951a8 GetKey_Internal_Info
+ms 0x803823ec LoadRegisters
+ms 0x80382438 SaveRegisters
+ms 0x80363d50 SaveAndOpenMainMenu
+ms 0x80364266 OpenMainMenu
+ms 0x803658b0 ShowSystemDialog
+ms 0x803632fe OpenAddin_OS
+ms 0x8c0a304a MenuIndex
+ms 0x8c0a3046 OpenedMenuIndex
+ms 0x80362e7c InternalAppsInstalled
+ms 0x8036420a CountAppsLoaded
+ms 0x8071e540 CasioAppNames
+ms 0x803857b4 CompareAppNames
+ms 0x8c0a306c CurrentAppName
+ms 0x8071e138 InbuiltApps
+ms 0x802cca6c APP_PYTHON
+ms 0x800d74c0 APP_DIST
+ms 0x8036355c GetInbuiltAppFunction
+ms 0x80363386 AddinSetup
+ms 0x801e5afc ShouldOpenReset1
+ms 0x801e5b34 ShouldOpenUsernameDelete
diff --git a/targets/cg_1.00 b/targets/cg_1.00
new file mode 100644
index 0000000..9ecd806
--- /dev/null
+++ b/targets/cg_1.00
@@ -0,0 +1,4 @@
+vm "/os/cg/1.00/10.bin" ROM ROM_P2
+
+. "/symbols/syscalls_cg"
+. "/symbols/sh7305"
diff --git a/targets/cg_1.01 b/targets/cg_1.01
new file mode 100644
index 0000000..84045c9
--- /dev/null
+++ b/targets/cg_1.01
@@ -0,0 +1,4 @@
+vm "/os/cg/1.01/10.bin" ROM ROM_P2
+
+. "/symbols/syscalls_cg"
+. "/symbols/sh7305"
diff --git a/targets/cg_2.00 b/targets/cg_2.00
new file mode 100644
index 0000000..7965ce7
--- /dev/null
+++ b/targets/cg_2.00
@@ -0,0 +1,4 @@
+vm "/os/cg/2.00/20.bin" ROM ROM_P2
+
+. "/symbols/syscalls_cg"
+. "/symbols/sh7305"
diff --git a/targets/cg_3.00 b/targets/cg_3.00
index f6292f5..ec8cbc3 100644
--- a/targets/cg_3.00
+++ b/targets/cg_3.00
@@ -1,4 +1,4 @@
-vm "/os/cg/3.00/3.00.bin" ROM ROM_P2
+vm "/os/cg/3.00/50.bin" ROM ROM_P2
 
 . "/symbols/syscalls_cg"
 . "/symbols/sh7305"
diff --git a/targets/cg_3.60 b/targets/cg_3.60
index 9055ae4..daed9b6 100644
--- a/targets/cg_3.60
+++ b/targets/cg_3.60
@@ -1,4 +1,4 @@
-vm "/os/cg/3.60/3.60.bin" ROM ROM_P2
+vm "/os/cg/3.60/50.au.bin" ROM ROM_P2
 
 . "/symbols/syscalls_cg"
 . "/symbols/sh7305"
diff --git a/targets/cgemu_2.00 b/targets/cgemu_2.00
new file mode 100644
index 0000000..a51694b
--- /dev/null
+++ b/targets/cgemu_2.00
@@ -0,0 +1,4 @@
+vm "/os/cgemu/2.00/20.bin" ROM ROM_P2
+
+. "/symbols/syscalls_cg"
+. "/symbols/sh7305"