diff --git a/src/engine/platform/c64.cpp b/src/engine/platform/c64.cpp
index 6257daead..889211332 100644
--- a/src/engine/platform/c64.cpp
+++ b/src/engine/platform/c64.cpp
@@ -509,10 +509,17 @@ void DivPlatformC64::setChipModel(bool is6581) {
 }
 
 void DivPlatformC64::setFlags(unsigned int flags) {
-  if (flags&1) {
-    rate=COLOR_PAL*2.0/9.0;
-  } else {
-    rate=COLOR_NTSC*2.0/7.0;
+  switch (flags&0xf) {
+	case 0x0: // NTSC C64
+      rate=COLOR_NTSC*2.0/7.0;
+	  break;
+	case 0x1: // PAL C64
+      rate=COLOR_PAL*2.0/9.0;
+	  break;
+	case 0x2: // SSI 2001
+	default:
+      rate=14318180.0/16.0;
+	  break;
   }
   chipClock=rate;
 }
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 0aeeb129e..5b4fc8134 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -4714,7 +4714,7 @@ bool FurnaceGUI::loop() {
                   e->setSysFlags(i,1,restart);
                   updateWindowTitle();
                 }
-                if (ImGui::RadioButton("X68000 (4MHz)",flags==2)) {
+                if (ImGui::RadioButton("X1/X68000 (4MHz)",flags==2)) {
                   e->setSysFlags(i,2,restart);
                   updateWindowTitle();
                 }
@@ -4733,6 +4733,21 @@ bool FurnaceGUI::loop() {
                   updateWindowTitle();
                 }
                 break;
+              case DIV_SYSTEM_C64_8580:
+              case DIV_SYSTEM_C64_6581:
+                if (ImGui::RadioButton("NTSC (1.02MHz)",flags==0)) {
+                  e->setSysFlags(i,0,restart);
+                  updateWindowTitle();
+                }
+                if (ImGui::RadioButton("PAL (0.99MHz)",flags==1)) {
+                  e->setSysFlags(i,1,restart);
+                  updateWindowTitle();
+                }
+                if (ImGui::RadioButton("SSI 2001 (0.89MHz)",flags==2)) {
+                  e->setSysFlags(i,2,restart);
+                  updateWindowTitle();
+                }
+                break;
               case DIV_SYSTEM_AY8910:
               case DIV_SYSTEM_AY8930: {
                 ImGui::Text("Clock rate:");
@@ -4748,7 +4763,7 @@ bool FurnaceGUI::loop() {
                   e->setSysFlags(i,(flags&(~15))|2,restart);
                   updateWindowTitle();
                 }
-                if (ImGui::RadioButton("2MHz (Atari ST)",(flags&15)==3)) {
+                if (ImGui::RadioButton("2MHz (Atari ST/Sharp X1)",(flags&15)==3)) {
                   e->setSysFlags(i,(flags&(~15))|3,restart);
                   updateWindowTitle();
                 }
@@ -6157,6 +6172,12 @@ FurnaceGUI::FurnaceGUI():
       0
     }
   ));
+  cat.systems.push_back(FurnaceGUISysDef(
+    "Yamaha YM2413 (drums mode)", {
+      DIV_SYSTEM_OPLL_DRUMS, 64, 0, 0,
+      0
+    }
+  ));
   sysCategories.push_back(cat);
 
   cat=FurnaceGUISysCategory("Square");
@@ -6331,6 +6352,35 @@ FurnaceGUI::FurnaceGUI():
       0
     }
   ));
+  /*
+  cat.systems.push_back(FurnaceGUISysDef(
+    "Commodore 64 (6581 SID + Sound Expander)", {
+      DIV_SYSTEM_OPL, 64, 0, 0,
+      DIV_SYSTEM_C64_6581, 64, 0, 1,
+      0
+    }
+  ));
+  cat.systems.push_back(FurnaceGUISysDef(
+    "Commodore 64 (6581 SID + Sound Expander with drums mode)", {
+      DIV_SYSTEM_OPL_DRUMS, 64, 0, 0,
+      DIV_SYSTEM_C64_6581, 64, 0, 1,
+      0
+    }
+  ));
+  cat.systems.push_back(FurnaceGUISysDef(
+    "Commodore 64 (8580 SID + Sound Expander)", {
+      DIV_SYSTEM_OPL, 64, 0, 0,
+      DIV_SYSTEM_C64_8580, 64, 0, 1,
+      0
+    }
+  ));
+  cat.systems.push_back(FurnaceGUISysDef(
+    "Commodore 64 (8580 SID + Sound Expander with drums mode)", {
+      DIV_SYSTEM_OPL_DRUMS, 64, 0, 0,
+      DIV_SYSTEM_C64_8580, 64, 0, 1,
+      0
+    }
+  ));*/
   cat.systems.push_back(FurnaceGUISysDef(
     "Amiga", {
       DIV_SYSTEM_AMIGA, 64, 0, 0,
@@ -6343,6 +6393,20 @@ FurnaceGUI::FurnaceGUI():
       0
     }
   ));
+  cat.systems.push_back(FurnaceGUISysDef(
+    "MSX + MSX-MUSIC", {
+      DIV_SYSTEM_OPLL, 64, 0, 0,
+      DIV_SYSTEM_AY8910, 64, 0, 16,
+      0
+    }
+  ));
+  cat.systems.push_back(FurnaceGUISysDef(
+    "MSX + MSX-MUSIC (drums mode)", {
+      DIV_SYSTEM_OPLL_DRUMS, 64, 0, 0,
+      DIV_SYSTEM_AY8910, 64, 0, 16,
+      0
+    }
+  ));
   cat.systems.push_back(FurnaceGUISysDef(
     "ZX Spectrum (48K)", {
       DIV_SYSTEM_AY8910, 64, 0, 2,
@@ -6386,6 +6450,13 @@ FurnaceGUI::FurnaceGUI():
       0
     }
   ));
+  cat.systems.push_back(FurnaceGUISysDef(
+    "PC + SSI 2001", {
+      DIV_SYSTEM_C64_6581, 64, 0, 2,
+      DIV_SYSTEM_PCSPKR, 64, 0, 0,
+      0
+    }
+  ));
   cat.systems.push_back(FurnaceGUISysDef(
     "PC + Game Blaster", {
       DIV_SYSTEM_SAA1099, 64, -127, 1,
@@ -6408,6 +6479,24 @@ FurnaceGUI::FurnaceGUI():
       0
     }
   ));
+  cat.systems.push_back(FurnaceGUISysDef(
+    "PC + Sound Blaster w/Game Blaster Compatible", {
+      DIV_SYSTEM_OPL2, 64, 0, 0,
+      DIV_SYSTEM_SAA1099, 64, -127, 1,
+      DIV_SYSTEM_SAA1099, 64, 127, 1,
+      DIV_SYSTEM_PCSPKR, 64, 0, 0,
+      0
+    }
+  ));
+  cat.systems.push_back(FurnaceGUISysDef(
+    "PC + Sound Blaster w/Game Blaster Compatible (drums mode)", {
+      DIV_SYSTEM_OPL2_DRUMS, 64, 0, 0,
+      DIV_SYSTEM_SAA1099, 64, -127, 1,
+      DIV_SYSTEM_SAA1099, 64, 127, 1,
+      DIV_SYSTEM_PCSPKR, 64, 0, 0,
+      0
+    }
+  ));
   cat.systems.push_back(FurnaceGUISysDef(
     "PC + Sound Blaster Pro 2", {
       DIV_SYSTEM_OPL3, 64, 0, 0,
@@ -6422,10 +6511,24 @@ FurnaceGUI::FurnaceGUI():
       0
     }
   ));
+  cat.systems.push_back(FurnaceGUISysDef(
+    "Sharp X1", {
+      DIV_SYSTEM_AY8910, 64, 0, 3,
+      0
+    }
+  ));
+  cat.systems.push_back(FurnaceGUISysDef(
+    "Sharp X1 + FM Addon", {
+      DIV_SYSTEM_AY8910, 64, 0, 3,
+      DIV_SYSTEM_YM2151, 64, 0, 2,
+      0
+    }
+  ));
   /*
   cat.systems.push_back(FurnaceGUISysDef(
     "Sharp X68000", {
-      DIV_SYSTEM_AY8910, 64, 0, 16,
+      DIV_SYSTEM_YM2151, 64, 0, 2,
+      DIV_SYSTEM_MSM6258, 64, 0, 0,
       0
     }
   ));*/
@@ -6448,7 +6551,7 @@ FurnaceGUI::FurnaceGUI():
   ));
   cat.systems.push_back(FurnaceGUISysDef(
     "Sega OutRun/X Board", {
-      DIV_SYSTEM_YM2151, 64, 0, 0,
+      DIV_SYSTEM_YM2151, 64, 0, 2,
       DIV_SYSTEM_SEGAPCM, 64, 0, 0,
       0
     }
@@ -6552,7 +6655,7 @@ FurnaceGUI::FurnaceGUI():
   ));
   cat.systems.push_back(FurnaceGUISysDef(
     "Arcade (YM2151 and SegaPCM)", {
-      DIV_SYSTEM_YM2151, 64, 0, 0,
+      DIV_SYSTEM_YM2151, 64, 0, 2,
       DIV_SYSTEM_SEGAPCM_COMPAT, 64, 0, 0,
       0
     }