diff --git a/fxosrc b/fxosrc
index e030598..e484a6e 100644
--- a/fxosrc
+++ b/fxosrc
@@ -8,6 +8,9 @@
 vc cg_3.60
 . "/targets/cg_3.60"
 
+vc gemu_3.60
+. "/targets/gemu_3.60"
+
 vc cg_3.00
 . "/targets/cg_3.00"
 
@@ -26,4 +29,4 @@ vc cg_1.00
 # Default to cg_3.60
 vs cg_3.60
 
-ads
+#ads
diff --git a/symbols/syscalls_cg_dr_carlos b/symbols/syscalls_cg_dr_carlos
index 75b3d43..1d05ec1 100644
--- a/symbols/syscalls_cg_dr_carlos
+++ b/symbols/syscalls_cg_dr_carlos
@@ -49,8 +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 %01DF DisableGB18030
+ms %01E0 EnableGB18030
 ms %01EE GetPrintCXYPos
 ms %01EF GetPrintMiniPos
 ms %01F0 GetPrintMiniMiniPos
@@ -164,6 +164,7 @@ ms %07F0 Zero5
 ms %07F1 Zero6
 ms %07F2 DoNothing4
 ms %07F3 Zero7
+ms %0869 APP_LINK_USBConnect
 ms %0887 Print_Cost_Sel_Margin
 ms %08C2 Get8C3Flash
 ms %08C3 CursorGetSettings8C3
@@ -246,9 +247,11 @@ ms %12B7 ShouldOpenDiagnosticMenu
 ms %12B8 ShouldOpenInitializeAllMenu
 ms %12BC DoNothing1E
 ms %12BD Zero27
-ms %12C0 GetKeyWait_OS
 ms %12D3 UpdateBatteryState
+ms %1300 ProcessPrintChars
 ms %1342 Zero28
+ms %134E USB_Open
+ms %1350 USB_Close
 ms %1372 Zero29
 ms %1374 PartC
 ms %13AD Zero2A
@@ -263,7 +266,22 @@ ms %1835 Zero2E
 ms %1839 PowerOff_OS
 ms %1842 DoNothing23
 ms %1843 One
+ms %18CD GetPrintLength
+ms %18CE GetPrintLength_Localized
+ms %18CF GetPrintLength_WithSpaces
+ms %18F6 PrintPixXY_Normal
+ms %18F7 PrintPixXY_Normaller
+ms %18F8 PrintPixXY_NormallerRows
+ms %18F9 PrintPixXY_NormalRows
+ms %18FA PrintC3XY2_xlimitRows_StandardNormal
+ms %18FB PrintC3XY2_xlimitRows_Standard
+ms %18FC PrintC3XY2_xlimitRows
+ms %18FD PrintC3XY2_xlimit
+ms %18FE PrintPixXY_Standard
 ms %1900 Bdisp_WriteSystemMessageCharNormal
+ms %1902 PrintLocalized_xlimitRows_Normal
+ms %1903 PrintLocalized_xlimitRows_Standard
+ms %1904 PrintLocalized_xlimitRows
 ms %1905 Bdisp_WriteSystemMessageNormal
 ms %19F9 Zero2F
 ms %19FA Zero30
@@ -299,13 +317,50 @@ ms %1EA6 EnableGetKeytoMainFunctionReturn
 ms %1EA7 DisableGetKeytoMainFunctionReturn
 ms %1EA8 DoNothing26
 ms %1ED5 OS_InnerWait
+ms %1ED9 USB_IsOpen
+ms %1EDA USB_WriteSingle
+ms %1EDB USB_Write
+ms %1EDD USB_ReadSingle
+ms %1EDE USB_Read
+ms %1EDF USB_Peek
+ms %1EE0 USB_PollRX
+ms %1EE1 USB_PollTX
+ms %1EE2 USB_ClearRX
+ms %1EE3 USB_ClearTX
 ms %1EE5 DoNothing27
 ms %1EE6 DoNothing28
 ms %1F55 GetKey
 
 ms 0x800506dc Print_OSC16
 ms 0x800507d4 Print_OSC16_Char
+ms 0x800d74c0 APP_DIST
+ms 0x801951a8 GetKey_Internal_Info
+ms 0x801952bc GetKey_Internal
+ms 0x801e5afc ShouldOpenReset1
+ms 0x801e5b34 ShouldOpenUsernameDelete
+ms 0x801f26d6 Graph3DError
+ms 0x802cca6c APP_PYTHON
+ms 0x80362e7c InternalAppsInstalled
+ms 0x803632fe OpenAddin_OS
+ms 0x80363386 AddinSetup
+ms 0x8036355c GetInbuiltAppFunction
+ms 0x80363d50 SaveAndOpenMainMenu
+ms 0x8036420a CountAppsLoaded
+ms 0x80364266 OpenMainMenu
+ms 0x803658b0 ShowSystemDialog
+ms 0x803823ec LoadRegisters
+ms 0x80382438 SaveRegisters
+ms 0x803857b4 CompareAppNames
 ms 0x80399d14 C16C3Colours
+ms 0x805ff144 PRGMGetKeyCodes1_Normal
+ms 0x805ff238 PRGMGetKeyCodes1_Alpha
+ms 0x805ff32c PRGMGetKeyCodes1_Shift
+ms 0x805ff420 PRGMGetKeyCodes2_Normal
+ms 0x805ff514 PRGMGetKeyCodes2_Alpha
+ms 0x805ff608 PRGMGetKeyCodes2_Shift
+ms 0x805ff6fc PRGMGetKeyCodes2_Clip
+ms 0x8071e138 InbuiltApps
+ms 0x8071e540 CasioAppNames
 ms 0x8c04fb30 PrintOSCursorX
 ms 0x8c04fb34 PrintOSCursorY
 ms 0x8c04fb38 CursorFlashStyle
@@ -314,37 +369,11 @@ ms 0x8c090c1e BatteryState
 ms 0x8c0a3041 GetkeyToMainFunctionReturnFlag
 ms 0x8c0a3042 GetkeyToMainFunctionReturnFlagDefault
 ms 0x8c0a3043 SpecialMatrixMainFunctionReturnFlag
+ms 0x8c0a3046 OpenedMenuIndex
+ms 0x8c0a304a MenuIndex
+ms 0x8c0a306c CurrentAppName
 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/symbols/syscalls_cg_simlo b/symbols/syscalls_cg_simlo
index 8f49f61..68596ad 100644
--- a/symbols/syscalls_cg_simlo
+++ b/symbols/syscalls_cg_simlo
@@ -60,7 +60,6 @@ ms %01eb GetBoldMiniMiniGlyphPtr_MB
 ms %01f1 Cursor_SetPosition
 ms %01f3 Cursor_SetFlashMode_incompatible
 ms %01f5 Cursor_GetSettings
-ms %01f8 PrintXY
 ms %01f9 Print_OS
 ms %0208 PrintChar
 ms %021b PrintMiniMini
diff --git a/targets/cgemu_3.00 b/targets/cgemu_3.00
deleted file mode 100644
index 2b7b5ba..0000000
--- a/targets/cgemu_3.00
+++ /dev/null
@@ -1,4 +0,0 @@
-vm "/os/cgemu/3.00/3.00.12M.bin" ROM ROM_P2
-
-. "/symbols/syscalls_cg"
-. "/symbols/sh7305"