diff --git a/App Icons/Icon-ZX128-60.png b/App Icons/Icon-ZX128-60.png
new file mode 100644
index 00000000..58cee9d8
Binary files /dev/null and b/App Icons/Icon-ZX128-60.png differ
diff --git a/App Icons/Icon-ZX128-76.png b/App Icons/Icon-ZX128-76.png
new file mode 100644
index 00000000..85643e32
Binary files /dev/null and b/App Icons/Icon-ZX128-76.png differ
diff --git a/App Icons/Icon-ZX128-83.5.png b/App Icons/Icon-ZX128-83.5.png
new file mode 100644
index 00000000..3f587524
Binary files /dev/null and b/App Icons/Icon-ZX128-83.5.png differ
diff --git a/C64/Assets/Assets.xcassets/App Icon Previews/App Icon ZX-128 Preview.imageset/App Icon ZX-128 Preview.png b/C64/Assets/Assets.xcassets/App Icon Previews/App Icon ZX-128 Preview.imageset/App Icon ZX-128 Preview.png
new file mode 100644
index 00000000..1339aac5
Binary files /dev/null and b/C64/Assets/Assets.xcassets/App Icon Previews/App Icon ZX-128 Preview.imageset/App Icon ZX-128 Preview.png differ
diff --git a/C64/Assets/Assets.xcassets/App Icon Previews/App Icon ZX-128 Preview.imageset/Contents.json b/C64/Assets/Assets.xcassets/App Icon Previews/App Icon ZX-128 Preview.imageset/Contents.json
new file mode 100644
index 00000000..7ec19060
--- /dev/null
+++ b/C64/Assets/Assets.xcassets/App Icon Previews/App Icon ZX-128 Preview.imageset/Contents.json	
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "App Icon ZX-128 Preview.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/C64/Assets/Assets.xcassets/Device Colors/Educator 64 Case.colorset/Contents.json b/C64/Assets/Assets.xcassets/Device Colors/Educator 64 Case.colorset/Contents.json
index 14505c40..dec18e52 100644
--- a/C64/Assets/Assets.xcassets/Device Colors/Educator 64 Case.colorset/Contents.json	
+++ b/C64/Assets/Assets.xcassets/Device Colors/Educator 64 Case.colorset/Contents.json	
@@ -1,20 +1,20 @@
 {
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
   "colors" : [
     {
-      "idiom" : "universal",
       "color" : {
         "color-space" : "srgb",
         "components" : {
-          "red" : "0xC0",
           "alpha" : "1.000",
           "blue" : "0xB4",
-          "green" : "0xC3"
+          "green" : "0xC3",
+          "red" : "0xC0"
         }
-      }
+      },
+      "idiom" : "universal"
     }
-  ]
-}
\ No newline at end of file
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/C64/Assets/Assets.xcassets/Device Colors/ZX +2 Case.colorset/Contents.json b/C64/Assets/Assets.xcassets/Device Colors/ZX +2 Case.colorset/Contents.json
new file mode 100644
index 00000000..10388fcf
--- /dev/null
+++ b/C64/Assets/Assets.xcassets/Device Colors/ZX +2 Case.colorset/Contents.json	
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x72",
+          "green" : "0x71",
+          "red" : "0x6D"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/C64/Assets/Assets.xcassets/Hardware Parts/Sinclair ZX Spectrum +2.imageset/Contents.json b/C64/Assets/Assets.xcassets/Hardware Parts/Sinclair ZX Spectrum +2.imageset/Contents.json
new file mode 100644
index 00000000..db71d79c
--- /dev/null
+++ b/C64/Assets/Assets.xcassets/Hardware Parts/Sinclair ZX Spectrum +2.imageset/Contents.json	
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Sinclair ZX Spectrum +2@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/C64/Assets/Assets.xcassets/Hardware Parts/Sinclair ZX Spectrum +2.imageset/Sinclair ZX Spectrum +2@2x.png b/C64/Assets/Assets.xcassets/Hardware Parts/Sinclair ZX Spectrum +2.imageset/Sinclair ZX Spectrum +2@2x.png
new file mode 100644
index 00000000..4c61078e
Binary files /dev/null and b/C64/Assets/Assets.xcassets/Hardware Parts/Sinclair ZX Spectrum +2.imageset/Sinclair ZX Spectrum +2@2x.png differ
diff --git a/C64/Assets/Assets.xcassets/Keyboards/ZX Spectrum +2 Keyboard.imageset/Contents.json b/C64/Assets/Assets.xcassets/Keyboards/ZX Spectrum +2 Keyboard.imageset/Contents.json
new file mode 100644
index 00000000..287a28b8
--- /dev/null
+++ b/C64/Assets/Assets.xcassets/Keyboards/ZX Spectrum +2 Keyboard.imageset/Contents.json	
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "ZX Spectrum +2 Keyboard.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/C64/Assets/Assets.xcassets/Keyboards/ZX Spectrum +2 Keyboard.imageset/ZX Spectrum +2 Keyboard.png b/C64/Assets/Assets.xcassets/Keyboards/ZX Spectrum +2 Keyboard.imageset/ZX Spectrum +2 Keyboard.png
new file mode 100644
index 00000000..cf0fd6b8
Binary files /dev/null and b/C64/Assets/Assets.xcassets/Keyboards/ZX Spectrum +2 Keyboard.imageset/ZX Spectrum +2 Keyboard.png differ
diff --git a/C64/Assets/Base.lproj/Main.storyboard b/C64/Assets/Base.lproj/Main.storyboard
index 304faf60..d41ab153 100644
--- a/C64/Assets/Base.lproj/Main.storyboard
+++ b/C64/Assets/Base.lproj/Main.storyboard
@@ -228,7 +228,7 @@
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Version 1.5" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nWU-vj-bJA">
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Version 1.6" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nWU-vj-bJA">
                                         <rect key="frame" x="211" y="404" width="118" height="29"/>
                                         <fontDescription key="fontDescription" type="system" weight="medium" pointSize="24"/>
                                         <nil key="textColor"/>
@@ -307,7 +307,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="jMI-du-EXx" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="225" y="2128"/>
+            <point key="canvasLocation" x="224.99999999999997" y="2127.6720351390923"/>
         </scene>
         <!--License-->
         <scene sceneID="YD5-pv-jD6">
@@ -1868,7 +1868,7 @@
                                                                 </connections>
                                                             </button>
                                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0Oj-vZ-2lb" userLabel="Start Button" customClass="PillButton" customModule="C64UIComponents">
-                                                                <rect key="frame" x="84" y="128" width="84" height="32"/>
+                                                                <rect key="frame" x="84" y="128" width="52" height="32"/>
                                                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="16"/>
                                                                 <state key="normal" title="START">
                                                                     <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -1878,7 +1878,7 @@
                                                                 </connections>
                                                             </button>
                                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KQT-o5-uyI" customClass="PillButton" customModule="C64UIComponents">
-                                                                <rect key="frame" x="200" y="128" width="87" height="32"/>
+                                                                <rect key="frame" x="168" y="128" width="55" height="32"/>
                                                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="16"/>
                                                                 <state key="normal" title="TOOLS">
                                                                     <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -2072,7 +2072,7 @@
                                                                             <rect key="frame" x="0.0" y="0.0" width="482" height="59"/>
                                                                             <autoresizingMask key="autoresizingMask"/>
                                                                             <subviews>
-                                                                                <view opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rSo-nS-zEu" customClass="MediaView" customModule="C64UIComponents">
+                                                                                <view opaque="NO" contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rSo-nS-zEu" customClass="MediaView" customModule="C64UIComponents">
                                                                                     <rect key="frame" x="8" y="10" width="474" height="39"/>
                                                                                     <userDefinedRuntimeAttributes>
                                                                                         <userDefinedRuntimeAttribute type="boolean" keyPath="subtitleIsPETASCII" value="YES"/>
@@ -2108,7 +2108,7 @@
                                                                 <rect key="frame" x="0.0" y="0.0" width="482" height="33"/>
                                                                 <subviews>
                                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WU8-RS-VWj" userLabel="Start Button" customClass="PillButton" customModule="C64UIComponents">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="0.0" height="33"/>
+                                                                        <rect key="frame" x="0.0" y="0.0" width="31" height="33"/>
                                                                         <fontDescription key="fontDescription" type="boldSystem" pointSize="16"/>
                                                                         <state key="normal" title="START">
                                                                             <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -2118,7 +2118,7 @@
                                                                         </connections>
                                                                     </button>
                                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NaR-ga-Aoz" customClass="PillButton" customModule="C64UIComponents">
-                                                                        <rect key="frame" x="32" y="0.0" width="86" height="33"/>
+                                                                        <rect key="frame" x="63" y="0.0" width="55" height="33"/>
                                                                         <fontDescription key="fontDescription" type="boldSystem" pointSize="16"/>
                                                                         <state key="normal" title="TOOLS">
                                                                             <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
diff --git a/C64/Info.plist b/C64/Info.plist
index 9a8aea0b..ea7a9aa5 100644
--- a/C64/Info.plist
+++ b/C64/Info.plist
@@ -189,6 +189,13 @@
 					<string>Icon-VIC20-60</string>
 				</array>
 			</dict>
+			<key>App Icon ZX-128</key>
+			<dict>
+				<key>CFBundleIconFiles</key>
+				<array>
+					<string>Icon-ZX128-60</string>
+				</array>
+			</dict>
 			<key>App Icon ZX-48</key>
 			<dict>
 				<key>CFBundleIconFiles</key>
@@ -229,6 +236,15 @@
 					<string>Icon-VIC20-83.5</string>
 				</array>
 			</dict>
+			<key>App Icon ZX-128</key>
+			<dict>
+				<key>CFBundleIconFiles</key>
+				<array>
+					<string>Icon-ZX128-60</string>
+					<string>Icon-ZX128-76</string>
+					<string>Icon-ZX128-83.5</string>
+				</array>
+			</dict>
 			<key>App Icon ZX-48</key>
 			<dict>
 				<key>CFBundleIconFiles</key>
diff --git a/C64/Settings/AppIconViewController.swift b/C64/Settings/AppIconViewController.swift
index ed75b703..d1ab1cf6 100644
--- a/C64/Settings/AppIconViewController.swift
+++ b/C64/Settings/AppIconViewController.swift
@@ -40,9 +40,10 @@ class AppIconViewController: UIViewController {
         Section(title: nil, rows: [
             Row(name: "Commodore 64", iconName: "App Icon C64", defaultIcon: true),
             Row(name: "Commodore SX-64", iconName: "App Icon SX-64"),
-            Row(name: "Commodore C16, Plus/4", iconName: "App Icon C16"),
+            Row(name: "Commodore 16, Plus/4", iconName: "App Icon C16"),
             Row(name: "Commodore VIC-20", iconName: "App Icon VIC-20"),
-            Row(name: "Sinclair ZX Spectrum 16k, 48k", iconName: "App Icon ZX-48")
+            Row(name: "Sinclair ZX Spectrum 16k, 48k", iconName: "App Icon ZX-48"),
+            Row(name: "Sinclair ZX Spectrum 128k, +2", iconName: "App Icon ZX-128")
         ])
     ]
     
diff --git a/C64/Settings/LicensesViewController.swift b/C64/Settings/LicensesViewController.swift
index 06394265..35947e62 100644
--- a/C64/Settings/LicensesViewController.swift
+++ b/C64/Settings/LicensesViewController.swift
@@ -42,7 +42,8 @@ class LicensesViewController: UIViewController {
             "PET",
             "Ultimax",
             "VIC-1001",
-            "ZX Spectrum+"
+            "ZX Spectrum+",
+            "ZX Spectrum +2"
         ]),
         Section(title: "3rd Party Software", rows: [
             "CwlMutex",
@@ -52,7 +53,7 @@ class LicensesViewController: UIViewController {
             "SearchTextField",
         ]),
         Section(title: nil, rows: [
-            "Sepcial Thanks"
+            "Special Thanks"
         ])
     ]
     
diff --git a/C64/Settings/ReleaseNotesViewController.swift b/C64/Settings/ReleaseNotesViewController.swift
index ec844e2d..fffe5190 100644
--- a/C64/Settings/ReleaseNotesViewController.swift
+++ b/C64/Settings/ReleaseNotesViewController.swift
@@ -33,22 +33,10 @@ class ReleaseNotesViewController: UIViewController {
     }
     
     var releases = [
-        Release(name: "Release 1.5 build 7", year: 2020, month: 7, day: 5, changes: [
-            "Add ZX Spectrum+, ZX Spectrum 128k.",
-            "Add sound and tape support to ZX Spectrum."
-        ]),
-        Release(name: "Release 1.5 build 6", year: 2020, month: 7, day: 3, changes: [
-            "Fix communicating with vice emulator bug introduced in previous build.",
-            "Add Tape Recorder icon."
-        ]),
-        Release(name: "Release 1.5 build 5", year: 2020, month: 7, day: 3, changes: [
-            "Add preliminary ZX Spectrum 16k, 48k support (no sound, no tape deck, hardware keyboard mapping incomplete)."
-        ]),
-        Release(name: "Release 1.5 Build 4", year: 2020, month: 6, day: 29, changes: [
-            "Add C16, Plus/4 computers."
-        ]),
-        Release(name: "Release 1.5 Build 2", year: 2020, month: 6, day: 28, changes: [
+        Release(name: "Release 1.6", year: 2020, month: 7, day: 8, changes: [
             "Rename to Ready.",
+            "Added Commodore 16 and Plus/4 emulation.",
+            "Added ZX Spectrum emulation. Supported Models are 16k, 48k, Specturm+, 128k, +2.",
             "Add new app icons, one for each supported computer."
         ]),
         Release(name: "Release 1.5", year: 2020, month: 6, day: 28, changes: [
diff --git a/Emulator/CasstteDrive.swift b/Emulator/CasstteDrive.swift
index bbe60033..98a405a7 100644
--- a/Emulator/CasstteDrive.swift
+++ b/Emulator/CasstteDrive.swift
@@ -59,9 +59,9 @@ public struct CasstteDrive: MachinePart {
         ]),
         
         MachinePartSection(title: "Datasette", parts: [
-            CasstteDrive(identifier: "1530", name: "1530", fullName: "Commodore 1530 C2N", iconName: "Commodore 1530 C2N", connector: .commodoreTape, caseColorName: "1530 C2N Case"),
+            CasstteDrive(identifier: "1530", name: "1530", fullName: "Commodore 1530 C2N", iconName: "Commodore 1530 C2N", connector: .commodoreTapePort, caseColorName: "1530 C2N Case"),
 
-            CasstteDrive(identifier: "1530 Plus/4", name: "1530", fullName: "Commodore 1530 C2N", variantName: "for C16, Plus/4", iconName: "Commodore 1530 C2N Black", connector: .plus4Tape, caseColorName: "C16 Case"),
+            CasstteDrive(identifier: "1530 Plus/4", name: "1530", fullName: "Commodore 1530 C2N", variantName: "for C16, Plus/4", iconName: "Commodore 1530 C2N Black", connector: .plus4TapePort, caseColorName: "C16 Case"),
             
             CasstteDrive(identifier: "Tape Recorder", name: "Recorder", fullName: "Tape Recorder", iconName: "Tape Recorder", connector: .audioJackTape, caseColorName: "Tape Recorder Case")
 
diff --git a/Emulator/Computer.swift b/Emulator/Computer.swift
index 4e002e2f..84e61926 100644
--- a/Emulator/Computer.swift
+++ b/Emulator/Computer.swift
@@ -45,10 +45,10 @@ public struct Computer: MachinePart {
             switch self {
             case .c64:
                 return [
-                    Port(name: "Screen", key: .screen, connectorTypes: [.videoComponent], iconWidth: 2, iconHeight: 2),
+                    Port(name: "Screen", key: .screen, connectorTypes: [.videoComponent], supportsHotSwap: true, iconWidth: 2, iconHeight: 2),
                     Port(name: "User Port", key: .userPort, connectorTypes: [.c64UserPort]),
-                    Port(name: "Cassette", key: .cassetteDrive, connectorTypes: [.commodoreTape]),
-                    Port(name: "Cartridge", key: .expansionPort, connectorTypes: [.c64ExpansionPort]),
+                    Port(name: "Cassette", key: .cassetteDrive, connectorTypes: [.commodoreTapePort]),
+                    Port(name: "Cartridge", key: .expansionPort, connectorTypes: [.c64ExpansionPort, .media(.cartridgeCommodore64)]),
                     Port(name: "Disk Drive 8", key: .diskDrive8, connectorTypes: [.commodoreIEC], iconWidth: 2),
                     Port(name: "Disk Drive 9", key: .diskDrive9, connectorTypes: [.commodoreIEC], iconWidth: 2),
                     Port(name: "Disk Drive 10", key: .diskDrive10, connectorTypes: [.commodoreIEC], iconWidth: 2),
@@ -59,10 +59,10 @@ public struct Computer: MachinePart {
  
             case .plus4:
                 return [
-                    Port(name: "Screen", key: .screen, connectorTypes: [.videoComponent], iconWidth: 2, iconHeight: 2),
+                    Port(name: "Screen", key: .screen, connectorTypes: [.videoComponent], supportsHotSwap: true, iconWidth: 2, iconHeight: 2),
                     Port(name: "User Port", key: .userPort, connectorTypes: [.c64UserPort]),
-                    Port(name: "Cassette", key: .cassetteDrive, connectorTypes: [.plus4Tape]),
-                    Port(name: "Memory Expansion", key: .expansionPort, connectorTypes: [.plus4ExpansionPort]),
+                    Port(name: "Cassette", key: .cassetteDrive, connectorTypes: [.plus4TapePort]),
+                    Port(name: "Memory Expansion", key: .expansionPort, connectorTypes: [.plus4ExpansionPort, .media(.cartridgeCommodorePlus4)]),
                     Port(name: "Disk Drive 8", key: .diskDrive8, connectorTypes: [.commodoreIEC], iconWidth: 2), // TODO: 1551
                     Port(name: "Disk Drive 9", key: .diskDrive9, connectorTypes: [.commodoreIEC], iconWidth: 2),
                     Port(name: "Disk Drive 10", key: .diskDrive10, connectorTypes: [.commodoreIEC], iconWidth: 2),
@@ -73,17 +73,17 @@ public struct Computer: MachinePart {
                 
             case .spectrum:
                 return [
-                    Port(name: "Screen", key: .screen, connectorTypes: [.videoComponent], iconWidth: 2, iconHeight: 2),
+                    Port(name: "Screen", key: .screen, connectorTypes: [.videoComponent], supportsHotSwap: true, iconWidth: 2, iconHeight: 2),
                     Port(name: "Mic/Ear", key: .cassetteDrive, connectorTypes: [.audioJackTape]),
                     Port(name: "Expansion", key: .expansionPort, connectorTypes: [.spectrumExpansionPort]),
                 ]
 
             case .vic:
                 return [
-                    Port(name: "Screen", key: .screen, connectorTypes: [.videoComponent], iconWidth: 2, iconHeight: 2),
+                    Port(name: "Screen", key: .screen, connectorTypes: [.videoComponent], supportsHotSwap: true, iconWidth: 2, iconHeight: 2),
                     Port(name: "User Port", key: .userPort, connectorTypes: [.c64UserPort]),
-                    Port(name: "Cassette", key: .cassetteDrive, connectorTypes: [.commodoreTape]),
-                    Port(name: "Cartridge", key: .expansionPort, connectorTypes: [.vic20ExpansionPort]),
+                    Port(name: "Cassette", key: .cassetteDrive, connectorTypes: [.commodoreTapePort]),
+                    Port(name: "Cartridge", key: .expansionPort, connectorTypes: [.vic20ExpansionPort, .media(.cartridgeCommodoreVIC20)]),
                     Port(name: "Disk Drive 8", key: .diskDrive8, connectorTypes: [.commodoreIEC], iconWidth: 2),
                     Port(name: "Disk Drive 9", key: .diskDrive9, connectorTypes: [.commodoreIEC], iconWidth: 2),
                     Port(name: "Disk Drive 10", key: .diskDrive10, connectorTypes: [.commodoreIEC], iconWidth: 2),
@@ -122,6 +122,7 @@ public struct Computer: MachinePart {
         case zxSpectrum48k
         case zxSpectrum48kNtsc
         case zxSpectrum128k
+        case zxSpectrumPlus2
 
         public var viceMachine: ComputerType {
             switch self {
@@ -131,7 +132,7 @@ public struct Computer: MachinePart {
                 return .vic
             case .c16Pal, .c16Ntsc, .c232Ntsc, .plus4Pal, .plus4Ntsc, .v364Ntsc:
                 return .plus4
-            case .zxSpectrum16k, .zxSpectrum48k, .zxSpectrum48kNtsc, .zxSpectrum128k:
+            case .zxSpectrum16k, .zxSpectrum48k, .zxSpectrum48kNtsc, .zxSpectrum128k, .zxSpectrumPlus2:
                 return .spectrum
             }
         }
@@ -219,7 +220,7 @@ public struct Computer: MachinePart {
         return Chargen(named: chargenName, subdirectory: viceMachineModel.viceMachine.dataDirectory, bank: 1)
     }
 
-    public init(identifier: String, name: String, fullName: String? = nil, variantName: String? = nil, iconName: String, priority: Int = MachinePartNormalPriority, viceMachineModel: ViceModel, keyboardName: String?, caseColorName: String, drive8: DiskDrive? = nil, missingPorts: Set<MachineConfigOld.Key> = [], chargenName: String = "chargen") {
+    public init(identifier: String, name: String, fullName: String? = nil, variantName: String? = nil, iconName: String, priority: Int = MachinePartNormalPriority, viceMachineModel: ViceModel, keyboardName: String?, caseColorName: String, drive8: DiskDrive? = nil, missingPorts: Set<MachineConfigOld.Key> = [], additionalPorts: [Port]? = nil, chargenName: String = "chargen") {
         self.identifier = identifier
         self.name = name
         self.fullName = fullName ?? name
@@ -240,6 +241,9 @@ public struct Computer: MachinePart {
         for port in missingPorts {
             ports.removeAll(where: { $0.key == port })
         }
+        if let additionalPorts = additionalPorts {
+            ports.append(contentsOf: additionalPorts)
+        }
         self.chargenName = chargenName
     }
     
@@ -560,13 +564,29 @@ public struct Computer: MachinePart {
                      caseColorName: "ZX Plus Case"),
 
             Computer(identifier: "ZX 128k",
-                     name: "Sinclair ZX 128k (PAL)",
-                     fullName: "Sinclair ZX 128k",
+                     name: "Sinclair ZX Spectrum 128k (PAL)",
+                     fullName: "Sinclair ZX Spectrum 128k",
                      variantName: "PAL",
                      iconName: "Sinclair ZX Spectrum 128k",
                      viceMachineModel: .zxSpectrum128k,
                      keyboardName: "ZX Spectrum+",
                      caseColorName: "ZX Plus Case"),
+
+            Computer(identifier: "ZX +2",
+                     name: "Sinclair ZX Spectrum +2 (PAL)",
+                     fullName: "Sinclair ZX Spectrum +2",
+                     variantName: "PAL",
+                     iconName: "Sinclair ZX Spectrum +2",
+                     viceMachineModel: .zxSpectrumPlus2,
+                     keyboardName: "ZX Spectrum +2",
+                     caseColorName: "ZX +2 Case",
+                     missingPorts: [.cassetteDrive],
+                     additionalPorts: [
+//                        Port(name: "Cassete", key: .cassette, connectorTypes: [.media(.cassetteSpectrum)], supportsHotSwap: true),
+                        Port(name: "Joystick 1", key: .controlPort1, connectorTypes: [.atariJoystick], supportsHotSwap: true),
+                        Port(name: "Joystick 2", key: .controlPort2, connectorTypes: [.atariJoystick], supportsHotSwap: true),
+            ]),
+
         ]),
 ])
     
diff --git a/Emulator/ConnectorType.swift b/Emulator/ConnectorType.swift
index 6357dd07..417a53e4 100644
--- a/Emulator/ConnectorType.swift
+++ b/Emulator/ConnectorType.swift
@@ -22,11 +22,12 @@
  */
 
 import Foundation
+import RetroMedia
 
 // This is a list of all connectors used by supported devices.
 // It is used to filter the list of devices that can be connected to a port.
 
-public enum ConnectorType {
+public enum ConnectorType: Hashable {
     case atariJoystick
     case atariJoystickAnalog
     case audioJackTape
@@ -34,10 +35,12 @@ public enum ConnectorType {
     case c64JoystickLightpen
     case c64UserPort
     case computer // used for computers, which are the root of the device tree
+    case commodoreCassette
     case commodoreIEC
-    case commodoreTape
+    case commodoreTapePort
+    case ide
     case kempstonMouse
-    case plus4Tape
+    case plus4TapePort
     case plus4ExpansionPort
     case spectrumExpansionPort
     case vic20ExpansionPort
@@ -45,4 +48,6 @@ public enum ConnectorType {
     case videoRGBi
         
     case none // used for dummy parts
+    
+    case media(_ type: MediaType)
 }
diff --git a/Emulator/Emulator.swift b/Emulator/Emulator.swift
index 3bf32a34..30cd822d 100644
--- a/Emulator/Emulator.swift
+++ b/Emulator/Emulator.swift
@@ -33,6 +33,7 @@ import UIKit
     private var eventQueue = EventQueue()
     
     private var pressedKeys = Multiset<Key>()
+    private var joystickState = [JoystickButtons](repeating: JoystickButtons(), count: 10)
 
     // Call this function once per frame on emulator thread to process pending events. handle(event:) is called for each event.
     @objc public func handleEvents() -> Bool {
@@ -84,7 +85,11 @@ import UIKit
     }
 
     open func joystick(_ index: Int, buttons: JoystickButtons) {
+        guard index > 0 && index <= joystickState.count else { return }
+        guard buttons != joystickState[index] else { return }
         
+        send(event: .joystick(port: index, buttons: buttons, oldButtons: joystickState[index]))
+        joystickState[index] = buttons
     }
     
     open func mouse(moved distance: CGPoint) {
diff --git a/Emulator/EventQueue.swift b/Emulator/EventQueue.swift
index e4e46dff..4f20e5ba 100644
--- a/Emulator/EventQueue.swift
+++ b/Emulator/EventQueue.swift
@@ -26,7 +26,7 @@ import Foundation
 public enum Event {
     case attach(unit: Int, image: DiskImage?)
     case freeze
-    case joystick(port: Int, buttons: JoystickButtons)
+    case joystick(port: Int, buttons: JoystickButtons, oldButtons: JoystickButtons)
     case key(_ key: Key, pressed: Bool)
     case mouseButton(button: Int, pressed: Bool)
     case playPause(_ running: Bool)
diff --git a/Emulator/Ide64Cartridge.swift b/Emulator/Ide64Cartridge.swift
index ba21d371..a77fa07d 100644
--- a/Emulator/Ide64Cartridge.swift
+++ b/Emulator/Ide64Cartridge.swift
@@ -54,6 +54,14 @@ public struct Ide64Cartridge {
     public var version: Version
     
     public static var standard = Ide64Cartridge(version: .version4_1)
+
+    /*
+    public var ports = [
+        Port(name: "CF Card", key: .driveDrive, connectorTypes: [.media(.compactFlashIde64)]),
+        Port(name: "Master", key: .driveDrive2, connectorTypes: [.media(.harddiskIdeIde64), .ide])
+        Port(name: "Slave", key: .driveDrive3, connectorTypes: [.media(.harddiskIdeIde64)], .ide])
+    ]
+     */
 }
 
 extension Ide64Cartridge: MachinePart {
diff --git a/Emulator/InputMapping.swift b/Emulator/InputMapping.swift
index a81edcc0..bffed5c0 100644
--- a/Emulator/InputMapping.swift
+++ b/Emulator/InputMapping.swift
@@ -40,7 +40,7 @@ public struct InputPort: Hashable {
         return controller.inputType
     }
 
-    public init(port: Int, isUserPort: Bool, subPort: Int? = nil, controller: Controller) {
+    public init(port: Int, isUserPort: Bool, subPort: Int? = nil, controller: Controller, priority: Bool = false) {
         if isUserPort {
             name = "Userport \(port)"
             fullName = "Userport Joystick \(port)"
@@ -55,17 +55,17 @@ public struct InputPort: Hashable {
         playerIndex = vicePort
         self.controller = controller
         if isUserPort {
-            priority = MachinePartLowPriority - port
+            self.priority = MachinePartLowPriority - port
         }
         else {
             if controller.inputType == .mouse || controller.inputType == .lightGun || controller.inputType == .lightPen {
-                priority = MachinePartHighPriority + 10
+                self.priority = MachinePartHighPriority + 10
             }
-            else if port == 2 {
-                priority = MachinePartHighPriority
+            else if priority {
+                self.priority = MachinePartHighPriority
             }
             else {
-                priority = MachinePartNormalPriority - port
+                self.priority = MachinePartNormalPriority - port
             }
         }
         orderNumber = Double(vicePort)
diff --git a/Emulator/Keyboard.swift b/Emulator/Keyboard.swift
index 9e33aff4..e6db57e5 100644
--- a/Emulator/Keyboard.swift
+++ b/Emulator/Keyboard.swift
@@ -317,7 +317,7 @@ public struct Keyboard {
         self.keyboardSymbols = KeyboardSymbols.zxSpectrum 
     }
     
-    init(zxSpectrumPlusWithImageName imageName: String, rows: [Int], left: Int, right: Int, breakLeft: Int, deleteRight: Int, editRight: Int, returnLeft: Int, leftCapsShiftRight: Int, rightCapsShiftLeft: Int, spaceLeft: Int, spaceRight: Int) {
+    init(zxSpectrumPlusWithImageName imageName: String, rows: [Int], left: Int, right: Int, breakLeft: Int, deleteRight: Int, extendedRight: Int, editRight: Int, returnLeft: Int, leftCapsShiftRight: Int, rightCapsShiftLeft: Int, spaceLeft: Int, spaceRight: Int) {
         self.layout = Layout(rows: [
             Row(top: rows[0], bottom: rows[1], spans: [
                 Span(left: left, right: breakLeft, keys: [.TrueVideo, .InverseVideo, .Char("1"), .Char("2"), .Char("3"), .Char("4"), .Char("5"), .Char("6"), .Char("7"), .Char("8"), .Char("9"), .Char("0")]),
@@ -329,7 +329,7 @@ public struct Keyboard {
             ]),
             Row(top: rows[2], bottom: rows[3], spans: [
                 Span(left: left, right: deleteRight, keys: [.ExtendedMode]),
-                Span(left: deleteRight, right: editRight, keys: [.Edit]),
+                Span(left: extendedRight, right: editRight, keys: [.Edit]),
                 Span(left: editRight, right: returnLeft, keys: [.Char("a"), .Char("s"), .Char("d"), .Char("f"), .Char("g"), .Char("h"), .Char("j"), .Char("k"), .Char("l")]),
                 Span(left: returnLeft, right: right, keys: [.Return])
             ]),
@@ -566,12 +566,27 @@ public struct Keyboard {
                                  right: 1968,
                                  breakLeft: 1755,
                                  deleteRight: 273,
+                                 extendedRight: 273,
                                  editRight: 452,
                                  returnLeft: 1720,
                                  leftCapsShiftRight: 380,
                                  rightCapsShiftLeft: 1649,
                                  spaceLeft: 768,
-                                 spaceRight: 1404)
+                                 spaceRight: 1404),
+        
+        "ZX Spectrum +2": Keyboard(zxSpectrumPlusWithImageName: "ZX Spectrum +2 Keyboard",
+                                   rows: [53, 162, 275, 390, 505, 624],
+                                   left: 47,
+                                   right: 1583,
+                                   breakLeft: 1390,
+                                   deleteRight: 216,
+                                   extendedRight: 241,
+                                   editRight: 350,
+                                   returnLeft: 1364,
+                                   leftCapsShiftRight: 296,
+                                   rightCapsShiftLeft: 1309,
+                                   spaceLeft: 602,
+                                   spaceRight: 1116)
     ]
     
     public static func keyboard(named name: String) -> Keyboard? {
diff --git a/Emulator/Machine.swift b/Emulator/Machine.swift
new file mode 100644
index 00000000..5fa79e4f
--- /dev/null
+++ b/Emulator/Machine.swift
@@ -0,0 +1,22 @@
+//
+//  Machine.swift
+//  Emulator
+//
+//  Created by Dieter Baron on 07.07.20.
+//  Copyright © 2020 Spiderlab. All rights reserved.
+//
+
+import Foundation
+import C64UIComponents
+
+public class Machine {
+    public var config: MachineConfig
+    public var media: [MediaItem]
+    
+    public init(config: MachineConfig, media: [MediaItem]) {
+        self.config = config
+        self.media = media
+    }
+    
+    
+}
diff --git a/Emulator/MachineOld.swift b/Emulator/MachineOld.swift
index b11277f1..eb38a332 100644
--- a/Emulator/MachineOld.swift
+++ b/Emulator/MachineOld.swift
@@ -372,7 +372,8 @@ extension MachineOld {
             break
             
         case .joystick, .lightGun, .lightPen, .mouse:
-            inputPorts.append(InputPort(port: port, isUserPort: isUserPort, controller: controller))
+            let priorityPort = specification.computer.viceMachineModel.viceMachine == .spectrum ? 1 : 2
+            inputPorts.append(InputPort(port: port, isUserPort: isUserPort, controller: controller, priority: port == priorityPort))
         case .paddle:
             if !isUserPort {
                 inputPorts.append(InputPort(port: port, isUserPort: false, subPort: 1, controller: controller))
diff --git a/FuseZX/Fuse.swift b/FuseZX/Fuse.swift
index 4abfc74d..a2528692 100644
--- a/FuseZX/Fuse.swift
+++ b/FuseZX/Fuse.swift
@@ -1,6 +1,6 @@
 /*
  FuseZX.swift -- High Level Interface to fuse
- Copyright (C) 2019 Dieter Baron
+ Copyright (C) 2020 Dieter Baron
  
  This file is part of C64, a Commodore 64 emulator for iOS, based on VICE.
  The authors can be contacted at <c64@spiderlab.at>
@@ -26,14 +26,16 @@ import Emulator
 
 import FuseC
 
+extension keyboard_key_name: Hashable { }
+
 @objc public class Fuse: Emulator {
     public override init() {
         fuseThread = FuseThread()
         super.init()
         fuseThread?.delegate = self
     }
-    
-    private var pressedKeys = Multiset<Key>()
+        
+    private var pressedKeys = Multiset<keyboard_key_name>()
     
     func fuseName(for model: Computer.ViceModel) -> String? {
         switch model {
@@ -49,11 +51,23 @@ import FuseC
         case .zxSpectrum128k:
             return "128"
             
+        case .zxSpectrumPlus2:
+            return "plus2"
         default:
             return nil
         }
     }
     
+    func builtinControllerPorts(for model: Computer.ViceModel) -> [joystick_type_t] {
+        switch model {
+        case .zxSpectrumPlus2:
+            return [JOYSTICK_TYPE_SINCLAIR_1, JOYSTICK_TYPE_SINCLAIR_2]
+            
+        default:
+            return []
+        }
+    }
+    
     func fuseKeys(for key: Key) -> [keyboard_key_name]? {
         switch key {
         case .Char(" "):
@@ -177,20 +191,36 @@ import FuseC
     
     override public func handle(event: Event) -> Bool {
         switch event {
+        case let .joystick(port: port, buttons: buttons, oldButtons: oldButtons):
+            if buttons.left != oldButtons.left {
+                joystick_press(Int32(port) - 1, JOYSTICK_BUTTON_LEFT, buttons.left ? 1 : 0)
+            }
+            if buttons.right != oldButtons.right {
+                joystick_press(Int32(port) - 1, JOYSTICK_BUTTON_RIGHT, buttons.right ? 1 : 0)
+            }
+            if buttons.up != oldButtons.up {
+                joystick_press(Int32(port) - 1, JOYSTICK_BUTTON_UP, buttons.up ? 1 : 0)
+            }
+            if buttons.down != oldButtons.down {
+                joystick_press(Int32(port) - 1, JOYSTICK_BUTTON_DOWN, buttons.down ? 1 : 0)
+            }
+            if buttons.fire != oldButtons.fire {
+                joystick_press(Int32(port) - 1, JOYSTICK_BUTTON_FIRE, buttons.fire ? 1 : 0)
+            }
         case .key(let key, let pressed):
             if let keyNames = fuseKeys(for: key) {
                 if pressed {
-                    pressedKeys.add(key)
-                    if pressedKeys.count(for: key) == 1 {
-                        for keyName in keyNames {
+                    for keyName in keyNames {
+                        pressedKeys.add(keyName)
+                        if pressedKeys.count(for: keyName) == 1 {
                             keyboard_press(keyName)
                         }
                     }
                 }
                 else {
-                    pressedKeys.remove(key)
-                    if pressedKeys.count(for: key) == 0 {
-                        for keyName in keyNames {
+                    for keyName in keyNames {
+                        pressedKeys.remove(keyName)
+                        if pressedKeys.count(for: keyName) == 0 {
                             keyboard_release(keyName)
                         }
                     }
@@ -208,7 +238,8 @@ import FuseC
     }
     
     override public func start() {
-        guard let modelName = fuseName(for: machine.specification.computer.viceMachineModel) else { return } // TODO: close view
+        let model = machine.specification.computer.viceMachineModel
+        guard let modelName = fuseName(for: model) else { return } // TODO: close view
         var args = [
             "fuse",
             "--no-interface2", "--no-zxprinter",
@@ -219,6 +250,10 @@ import FuseC
             args.append("--tape")
             args.append(url.path)
         }
+        for (index, type) in builtinControllerPorts(for: model).enumerated() {
+            args.append("--joystick-\(index + 1)-output")
+            args.append("\(type.rawValue)")
+        }
         fuseThread?.args = args
         fuseThread?.start()
     }
diff --git a/FuseZX/module.modulemap b/FuseZX/module.modulemap
index fa4a8570..39e2a9f9 100644
--- a/FuseZX/module.modulemap
+++ b/FuseZX/module.modulemap
@@ -1,6 +1,7 @@
 module FuseC [system][extern_c] {
     header "../fuse/fuse.h"
     header "../fuse/keyboard.h"
+    header "../fuse/peripherals/joystick.h"
     header "FuseThread.h"
     export *
 }
diff --git a/Licenses/C64 Japanese Keyboard.txt b/Licenses/Japanese C64.txt
similarity index 100%
rename from Licenses/C64 Japanese Keyboard.txt
rename to Licenses/Japanese C64.txt
diff --git a/Licenses/Mulstiset.txt b/Licenses/Multiset.txt
similarity index 100%
rename from Licenses/Mulstiset.txt
rename to Licenses/Multiset.txt
diff --git a/Licenses/PET Style Keyboard.txt b/Licenses/PET.txt
similarity index 100%
rename from Licenses/PET Style Keyboard.txt
rename to Licenses/PET.txt
diff --git a/Licenses/Ultimax Keyboard.txt b/Licenses/Ultimax.txt
similarity index 100%
rename from Licenses/Ultimax Keyboard.txt
rename to Licenses/Ultimax.txt
diff --git a/Licenses/VIC-1001 Keyboard.txt b/Licenses/VIC-1001.txt
similarity index 100%
rename from Licenses/VIC-1001 Keyboard.txt
rename to Licenses/VIC-1001.txt
diff --git a/Licenses/ZX SPectrum Plus Keyboard.txt b/Licenses/ZX Spectrum +2.txt
similarity index 100%
rename from Licenses/ZX SPectrum Plus Keyboard.txt
rename to Licenses/ZX Spectrum +2.txt
diff --git a/Licenses/ZX Spectrum+.txt b/Licenses/ZX Spectrum+.txt
new file mode 100644
index 00000000..ea4f5a1e
--- /dev/null
+++ b/Licenses/ZX Spectrum+.txt	
@@ -0,0 +1,4 @@
+Photo by Pawel Pieczul, used by permission.
+
+Taken from Old Crap Vintage Computing
+(https://oldcrap.org/)
diff --git a/README.md b/README.md
index b3ecd8ea..33cedf58 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,14 @@
 
 ![Screenshot](screenshot.png)
 
-Ready is an open source emulator for the 8 bit home computers [Commodore 64](https://en.wikipedia.org/wiki/Commodore_64) and [Commodore VIC-20](https://en.wikipedia.org/wiki/Commodore_VIC-20). It is based on [Vice](http://vice-emu.sourceforge.net), which provices accurate emulation of many hardware variants and peripherals.
+Ready is an open source emulator for the following 8 bit home computers:
+
+- [Commodore 64](https://en.wikipedia.org/wiki/Commodore_64)
+- [Commodore VIC-20](https://en.wikipedia.org/wiki/Commodore_VIC-20)
+- [Commodore 16, Plus/4](https://en.wikipedia.org/wiki/Commodore_Plus/4)
+- [Sinclair ZX Spectrum](https://en.wikipedia.org/wiki/ZX_Spectrum) (16k, 48k, Spectrum+, 128k, +2)
+
+It is based on [Vice](http://vice-emu.sourceforge.net) and [fuse](http://fuse-emulator.sourceforge.net/), which provide accurate emulation of many hardware variants and peripherals.
 
 It requires at least iPadOS 13.5.
 
@@ -34,6 +41,6 @@ The authors can be contacted at c64@spiderlab.at.
 
 Since emulators where users can add their own programs are not allowed in the App Store, you will have to install it yourself. You will need [Xcode](https://developer.apple.com/xcode/) and a [developer certificate](https://developer.apple.com/account/).
 
-You can build it from source yourself. C64 has no external dependencies. 
+You can build it from source yourself. Ready has no external dependencies. 
 
 Or you can use [iOS App Signer](https://dantheman827.github.io/ios-app-signer/) to install a pre-built binary release (`.ipa` file).
diff --git a/Ready.xcodeproj/project.pbxproj b/Ready.xcodeproj/project.pbxproj
index 4770a52b..0c378712 100644
--- a/Ready.xcodeproj/project.pbxproj
+++ b/Ready.xcodeproj/project.pbxproj
@@ -1185,6 +1185,9 @@
 		4B94398C24ADEF0900FD0237 /* scalers16.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B94398B24ADEF0900FD0237 /* scalers16.c */; };
 		4B94398E24ADEF2700FD0237 /* scalers32.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B94398D24ADEF2700FD0237 /* scalers32.c */; };
 		4B94399224AE834000FD0237 /* EventQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B94399024AE833100FD0237 /* EventQueue.swift */; };
+		4B9ABB1724B5F5B900678531 /* Icon-ZX128-83.5.png in Resources */ = {isa = PBXBuildFile; fileRef = 4B9ABB1424B5F5B800678531 /* Icon-ZX128-83.5.png */; };
+		4B9ABB1824B5F5B900678531 /* Icon-ZX128-60.png in Resources */ = {isa = PBXBuildFile; fileRef = 4B9ABB1524B5F5B900678531 /* Icon-ZX128-60.png */; };
+		4B9ABB1924B5F5B900678531 /* Icon-ZX128-76.png in Resources */ = {isa = PBXBuildFile; fileRef = 4B9ABB1624B5F5B900678531 /* Icon-ZX128-76.png */; };
 		4B9DBB60222A8B9A0032B280 /* MachinePartTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DBB5F222A8B9A0032B280 /* MachinePartTableViewCell.swift */; };
 		4B9DBB62222A8BE60032B280 /* SelectMachinePartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DBB61222A8BE60032B280 /* SelectMachinePartViewController.swift */; };
 		4B9DBB642231431B0032B280 /* MfiInputDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DBB632231431B0032B280 /* MfiInputDevice.swift */; };
@@ -1193,6 +1196,12 @@
 		4B9DBB78223904B00032B280 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4B9DBB77223904B00032B280 /* Assets.xcassets */; };
 		4BA0AE7D22957B1600E54C96 /* PillButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BA0AE7C22957B1600E54C96 /* PillButton.swift */; };
 		4BA1E9B924B314C100D935D3 /* MultiSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BA1E9B824B314C100D935D3 /* MultiSet.swift */; };
+		4BA1E9BB24B49A4F00D935D3 /* Machine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BA1E9BA24B49A4F00D935D3 /* Machine.swift */; };
+		4BA1E9C524B49EDE00D935D3 /* RetroMedia.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BA1E9C324B49EDE00D935D3 /* RetroMedia.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		4BA1E9C824B49EDE00D935D3 /* RetroMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BA1E9C124B49EDE00D935D3 /* RetroMedia.framework */; };
+		4BA1E9C924B49EDE00D935D3 /* RetroMedia.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BA1E9C124B49EDE00D935D3 /* RetroMedia.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		4BA1E9CE24B49F0A00D935D3 /* MediaType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BA1E9CD24B49F0A00D935D3 /* MediaType.swift */; };
+		4BA1E9CF24B4A0F400D935D3 /* RetroMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BA1E9C124B49EDE00D935D3 /* RetroMedia.framework */; };
 		4BACE33922172AB600FC3403 /* MouseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BACE337221708F200FC3403 /* MouseView.swift */; };
 		4BACE33B2218582000FC3403 /* MouseGestureRecognizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BACE33A2218582000FC3403 /* MouseGestureRecognizer.swift */; };
 		4BAE5BF221FDD72E0098ADFF /* FileDocument.png in Resources */ = {isa = PBXBuildFile; fileRef = 4BAE5BF121FDD72E0098ADFF /* FileDocument.png */; };
@@ -1280,6 +1289,13 @@
 			remoteGlobalIDString = 4B7609EF21F47B900058FBCD;
 			remoteInfo = C64UIComponents;
 		};
+		4BA1E9C624B49EDE00D935D3 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 4B3F973B21D7ACC700C272C4 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 4BA1E9C024B49EDE00D935D3;
+			remoteInfo = RetroMedia;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -1792,6 +1808,7 @@
 				4B68F8B92496407700A76E57 /* Emulator.framework in Embed Frameworks */,
 				4B5412D024AB519900F6925B /* FuseZX.framework in Embed Frameworks */,
 				4B68FB4624967CCD00A76E57 /* ViceC64.framework in Embed Frameworks */,
+				4BA1E9C924B49EDE00D935D3 /* RetroMedia.framework in Embed Frameworks */,
 				4B540E9F24A674E100F6925B /* VicePlus4.framework in Embed Frameworks */,
 				4B68FB892498DC0600A76E57 /* ViceVIC20.framework in Embed Frameworks */,
 			);
@@ -4170,6 +4187,9 @@
 		4B94398B24ADEF0900FD0237 /* scalers16.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = scalers16.c; sourceTree = "<group>"; };
 		4B94398D24ADEF2700FD0237 /* scalers32.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = scalers32.c; sourceTree = "<group>"; };
 		4B94399024AE833100FD0237 /* EventQueue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventQueue.swift; sourceTree = "<group>"; };
+		4B9ABB1424B5F5B800678531 /* Icon-ZX128-83.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-ZX128-83.5.png"; sourceTree = "<group>"; };
+		4B9ABB1524B5F5B900678531 /* Icon-ZX128-60.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-ZX128-60.png"; sourceTree = "<group>"; };
+		4B9ABB1624B5F5B900678531 /* Icon-ZX128-76.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-ZX128-76.png"; sourceTree = "<group>"; };
 		4B9DBB59222911CC0032B280 /* MachinePart.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MachinePart.swift; sourceTree = "<group>"; };
 		4B9DBB5B222922420032B280 /* Controller.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Controller.swift; sourceTree = "<group>"; };
 		4B9DBB5D22292B8E0032B280 /* InputDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputDevice.swift; sourceTree = "<group>"; };
@@ -4187,6 +4207,11 @@
 		4B9DBB77223904B00032B280 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		4BA0AE7C22957B1600E54C96 /* PillButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PillButton.swift; sourceTree = "<group>"; };
 		4BA1E9B824B314C100D935D3 /* MultiSet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultiSet.swift; sourceTree = "<group>"; };
+		4BA1E9BA24B49A4F00D935D3 /* Machine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Machine.swift; sourceTree = "<group>"; };
+		4BA1E9C124B49EDE00D935D3 /* RetroMedia.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RetroMedia.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		4BA1E9C324B49EDE00D935D3 /* RetroMedia.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RetroMedia.h; sourceTree = "<group>"; };
+		4BA1E9C424B49EDE00D935D3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		4BA1E9CD24B49F0A00D935D3 /* MediaType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaType.swift; sourceTree = "<group>"; };
 		4BAAD2AA21E76B4700709807 /* DiskImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiskImage.swift; sourceTree = "<group>"; };
 		4BACE337221708F200FC3403 /* MouseView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MouseView.swift; sourceTree = "<group>"; };
 		4BACE33A2218582000FC3403 /* MouseGestureRecognizer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MouseGestureRecognizer.swift; sourceTree = "<group>"; };
@@ -4286,6 +4311,7 @@
 				4B68FB882498DC0600A76E57 /* ViceVIC20.framework in Frameworks */,
 				4B7609F721F47B900058FBCD /* C64UIComponents.framework in Frameworks */,
 				4B68FB4524967CCD00A76E57 /* ViceC64.framework in Frameworks */,
+				4BA1E9C824B49EDE00D935D3 /* RetroMedia.framework in Frameworks */,
 				4B5412CF24AB519900F6925B /* FuseZX.framework in Frameworks */,
 				4B68F8B82496407700A76E57 /* Emulator.framework in Frameworks */,
 				4BBF86B021DB9AB400EF99ED /* CoreAudio.framework in Frameworks */,
@@ -4423,6 +4449,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				4BA1E9CF24B4A0F400D935D3 /* RetroMedia.framework in Frameworks */,
 				4B68FB592497517E00A76E57 /* C64UIComponents.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -4832,6 +4859,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		4BA1E9BE24B49EDE00D935D3 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
@@ -4959,6 +4993,7 @@
 				4B54145F24ABA96600F6925B /* libspectrum */,
 				4BA81FB321E4713700D036DE /* vice */,
 				4B3F975D21D7ACC800C272C4 /* C64Tests */,
+				4BA1E9C224B49EDE00D935D3 /* RetroMedia */,
 				4B68F8B22496407700A76E57 /* Emulator */,
 				4B81F2A924B0664B0090B21A /* ViceShared */,
 				4B68FB3F24967CCD00A76E57 /* ViceC64 */,
@@ -5032,6 +5067,7 @@
 				4B54143424ABA59100F6925B /* libvice-driveiecc64exp.a */,
 				4B54144A24ABA66F00F6925B /* libvice-viciisc.a */,
 				4B54151324ABABC600F6925B /* libfuse-libspectrum.a */,
+				4BA1E9C124B49EDE00D935D3 /* RetroMedia.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -6755,6 +6791,9 @@
 				4B54100F24AA7FF000F6925B /* Icon-ZX48-60.png */,
 				4B54100E24AA7FEF00F6925B /* Icon-ZX48-76.png */,
 				4B54100D24AA7FEF00F6925B /* Icon-ZX48-83.5.png */,
+				4B9ABB1524B5F5B900678531 /* Icon-ZX128-60.png */,
+				4B9ABB1624B5F5B900678531 /* Icon-ZX128-76.png */,
+				4B9ABB1424B5F5B800678531 /* Icon-ZX128-83.5.png */,
 			);
 			path = "App Icons";
 			sourceTree = "<group>";
@@ -8065,6 +8104,7 @@
 				4B9DBB6B2232555F0032B280 /* DummyMachinePart.swift */,
 				4B68F8B32496407700A76E57 /* Emulator.h */,
 				4B68F8BE24966ECF00A76E57 /* Emulator.swift */,
+				4BA1E9BA24B49A4F00D935D3 /* Machine.swift */,
 				4B68F8AA24963F1B00A76E57 /* EmulatorDelegate.swift */,
 				4B81F2A624AF12E30090B21A /* EmulatorThread.h */,
 				4B81F2A424AF12B50090B21A /* EmulatorThread.m */,
@@ -8297,6 +8337,16 @@
 			path = "Document Icons";
 			sourceTree = "<group>";
 		};
+		4BA1E9C224B49EDE00D935D3 /* RetroMedia */ = {
+			isa = PBXGroup;
+			children = (
+				4BA1E9C324B49EDE00D935D3 /* RetroMedia.h */,
+				4BA1E9C424B49EDE00D935D3 /* Info.plist */,
+				4BA1E9CD24B49F0A00D935D3 /* MediaType.swift */,
+			);
+			path = RetroMedia;
+			sourceTree = "<group>";
+		};
 		4BA81FB321E4713700D036DE /* vice */ = {
 			isa = PBXGroup;
 			children = (
@@ -8444,6 +8494,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		4BA1E9BC24B49EDE00D935D3 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4BA1E9C524B49EDE00D935D3 /* RetroMedia.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
@@ -8467,6 +8525,7 @@
 				4B68FB4424967CCD00A76E57 /* PBXTargetDependency */,
 				4B68FB872498DC0600A76E57 /* PBXTargetDependency */,
 				4B540E9D24A674E100F6925B /* PBXTargetDependency */,
+				4BA1E9C724B49EDE00D935D3 /* PBXTargetDependency */,
 			);
 			name = Ready;
 			productName = C64;
@@ -9465,6 +9524,24 @@
 			productReference = 4B7609F021F47B900058FBCD /* C64UIComponents.framework */;
 			productType = "com.apple.product-type.framework";
 		};
+		4BA1E9C024B49EDE00D935D3 /* RetroMedia */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 4BA1E9CA24B49EDE00D935D3 /* Build configuration list for PBXNativeTarget "RetroMedia" */;
+			buildPhases = (
+				4BA1E9BC24B49EDE00D935D3 /* Headers */,
+				4BA1E9BD24B49EDE00D935D3 /* Sources */,
+				4BA1E9BE24B49EDE00D935D3 /* Frameworks */,
+				4BA1E9BF24B49EDE00D935D3 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = RetroMedia;
+			productName = RetroMedia;
+			productReference = 4BA1E9C124B49EDE00D935D3 /* RetroMedia.framework */;
+			productType = "com.apple.product-type.framework";
+		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
@@ -9514,6 +9591,10 @@
 						CreatedOnToolsVersion = 10.1;
 						LastSwiftMigration = 1020;
 					};
+					4BA1E9C024B49EDE00D935D3 = {
+						CreatedOnToolsVersion = 11.5;
+						LastSwiftMigration = 1150;
+					};
 				};
 			};
 			buildConfigurationList = 4B3F973E21D7ACC700C272C4 /* Build configuration list for PBXProject "Ready" */;
@@ -9532,6 +9613,7 @@
 				4B3F974221D7ACC700C272C4 /* Ready */,
 				4B7609EF21F47B900058FBCD /* C64UIComponents */,
 				4B68F8B02496407700A76E57 /* Emulator */,
+				4BA1E9C024B49EDE00D935D3 /* RetroMedia */,
 				4B5412C724AB519900F6925B /* FuseZX */,
 				4B68FB3D24967CCD00A76E57 /* ViceC64 */,
 				4B540E9624A674E100F6925B /* VicePlus4 */,
@@ -9605,6 +9687,7 @@
 				4B540ECD24A8D84100F6925B /* Icon-VIC20-76.png in Resources */,
 				4B841CFA21F75C12009CAF4B /* Floppy35Document.png in Resources */,
 				4B540ED024A8D84100F6925B /* Icon-SX64-76.png in Resources */,
+				4B9ABB1824B5F5B900678531 /* Icon-ZX128-60.png in Resources */,
 				4B3182CE2282F36E006D86AC /* Compact Disc Document.png in Resources */,
 				4B460E4E2279F46A00815E7F /* REU Document.png in Resources */,
 				4B3182C72281E320006D86AC /* IDE Hard Disk.png in Resources */,
@@ -9624,7 +9707,9 @@
 				4B54101124AA7FF000F6925B /* Icon-ZX48-76.png in Resources */,
 				4B9DBB78223904B00032B280 /* Assets.xcassets in Resources */,
 				4B540ED324A8D84100F6925B /* Icon-VIC20-83.5.png in Resources */,
+				4B9ABB1724B5F5B900678531 /* Icon-ZX128-83.5.png in Resources */,
 				4BAE5BF221FDD72E0098ADFF /* FileDocument.png in Resources */,
+				4B9ABB1924B5F5B900678531 /* Icon-ZX128-76.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -9671,6 +9756,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		4BA1E9BF24B49EDE00D935D3 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -10223,6 +10315,7 @@
 				4B68FB702497749B00A76E57 /* Computer.swift in Sources */,
 				4B2FA1A724B1B792002A11BA /* MachinePartRegister.swift in Sources */,
 				4B68FB612497524B00A76E57 /* CasstteDrive.swift in Sources */,
+				4BA1E9BB24B49A4F00D935D3 /* Machine.swift in Sources */,
 				4B81F2A524AF12B50090B21A /* EmulatorThread.m in Sources */,
 				4B68FB5E2497520300A76E57 /* CartridgeImage.swift in Sources */,
 				4B68FB632497525A00A76E57 /* MachineConfigOld.swift in Sources */,
@@ -11101,6 +11194,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		4BA1E9BD24B49EDE00D935D3 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4BA1E9CE24B49F0A00D935D3 /* MediaType.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
@@ -11134,6 +11235,11 @@
 			target = 4B7609EF21F47B900058FBCD /* C64UIComponents */;
 			targetProxy = 4B7609F521F47B900058FBCD /* PBXContainerItemProxy */;
 		};
+		4BA1E9C724B49EDE00D935D3 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 4BA1E9C024B49EDE00D935D3 /* RetroMedia */;
+			targetProxy = 4BA1E9C624B49EDE00D935D3 /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
@@ -11290,7 +11396,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = F27CVJNWXK;
 				HEADER_SEARCH_PATHS = (
 					C64/Vice,
@@ -11302,7 +11408,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.5;
+				MARKETING_VERSION = 1.6;
 				PRODUCT_BUNDLE_IDENTIFIER = at.spiderlab.c64;
 				PRODUCT_NAME = Ready;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -11320,7 +11426,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = F27CVJNWXK;
 				HEADER_SEARCH_PATHS = (
 					C64/Vice,
@@ -11332,7 +11438,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.5;
+				MARKETING_VERSION = 1.6;
 				PRODUCT_BUNDLE_IDENTIFIER = at.spiderlab.c64;
 				PRODUCT_NAME = Ready;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -13976,6 +14082,82 @@
 			};
 			name = Release;
 		};
+		4BA1E9CB24B49EDE00D935D3 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DEVELOPMENT_TEAM = F27CVJNWXK;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				INFOPLIST_FILE = RetroMedia/Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = at.tpau.RetroMedia;
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				SKIP_INSTALL = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		4BA1E9CC24B49EDE00D935D3 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DEVELOPMENT_TEAM = F27CVJNWXK;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				INFOPLIST_FILE = RetroMedia/Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = at.tpau.RetroMedia;
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
@@ -14519,6 +14701,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		4BA1E9CA24B49EDE00D935D3 /* Build configuration list for PBXNativeTarget "RetroMedia" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				4BA1E9CB24B49EDE00D935D3 /* Debug */,
+				4BA1E9CC24B49EDE00D935D3 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 /* End XCConfigurationList section */
 
 /* Begin XCVersionGroup section */
diff --git a/RetroMedia/Info.plist b/RetroMedia/Info.plist
new file mode 100644
index 00000000..9bcb2444
--- /dev/null
+++ b/RetroMedia/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+</dict>
+</plist>
diff --git a/RetroMedia/MediaType.swift b/RetroMedia/MediaType.swift
new file mode 100644
index 00000000..b2cf5098
--- /dev/null
+++ b/RetroMedia/MediaType.swift
@@ -0,0 +1,40 @@
+//
+//  MediaType.swift
+//  RetroMedia
+//
+//  Created by Dieter Baron on 07.07.20.
+//  Copyright © 2020 Spiderlab. All rights reserved.
+//
+
+import Foundation
+
+/*
+ Type names consist of up to four parts:
+ - media type (cartridge, disk, tape)
+ - pysical media format (e.g. 3.5" DD disk)
+ - data format
+ 
+ */
+public enum MediaType {
+    case cartridgeCommodore64
+    case cartridgeCommodorePlus4
+    case cartridgeCommodoreVIC20
+    
+    case cassetteCommodore
+    case cassetteSpectrum
+    
+    case compactFlashIde64
+    
+    case cd
+    
+    case disk3_5DoubleDensityCmd
+    case disk3_5DoubleDensityCommodore
+    case disk3_5HighDensityCmd
+    case disk3_5ExtendedDensityCmd
+    case disk5_25SingleDensitySingleSidedCommodore
+    case disk5_25SingleDensityDoubleSidedCommodore
+    case disk5_25DoubleDensitySingleSidedCommodore
+    case disk5_25DoubleDensityDoulbeSidedCommodore
+    
+    case harddiskIdeIde64
+}
diff --git a/RetroMedia/RetroMedia.h b/RetroMedia/RetroMedia.h
new file mode 100644
index 00000000..abaa3b25
--- /dev/null
+++ b/RetroMedia/RetroMedia.h
@@ -0,0 +1,19 @@
+//
+//  RetroMedia.h
+//  RetroMedia
+//
+//  Created by Dieter Baron on 07.07.20.
+//  Copyright © 2020 Spiderlab. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+//! Project version number for RetroMedia.
+FOUNDATION_EXPORT double RetroMediaVersionNumber;
+
+//! Project version string for RetroMedia.
+FOUNDATION_EXPORT const unsigned char RetroMediaVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <RetroMedia/PublicHeader.h>
+
+
diff --git a/TODO.md b/TODO.md
index 11b05ed3..e4f4ec92 100644
--- a/TODO.md
+++ b/TODO.md
@@ -16,6 +16,7 @@
 
 ## other
 
+- multiple tape images
 - warn if media can't be used due to machine configuration
 - controller auto-mapping: input device priority per input type
 - fix dragging files out of Ready
@@ -84,7 +85,6 @@
 
 ## maybe
 
-- multiple tape images
 
 ## cleanup
 
diff --git a/ViceShared/Vice.swift b/ViceShared/Vice.swift
index 60ac9c03..0726b2fa 100644
--- a/ViceShared/Vice.swift
+++ b/ViceShared/Vice.swift
@@ -64,9 +64,7 @@ extension JoystickButtons {
             viceThread?.imageView = imageView
         }
     }
-        
-    public var joysticks = [JoystickButtons](repeating: JoystickButtons(), count: 10)
-    
+            
     private var tempFile: URL?
     
     public struct DriveInfo : Equatable {
@@ -201,15 +199,7 @@ extension JoystickButtons {
         machine.diskDrives[drive - 8].image = image
         send(event: .attach(unit: drive, image: image))
     }
-        
-    public override func joystick(_ index: Int, buttons: JoystickButtons) {
-        guard index > 0 else { return }
-        guard buttons != joysticks[index] else { return }
-        
-        joysticks[index] = buttons
-        send(event: .joystick(port: index, buttons: buttons))
-    }
-    
+
     public override func mouse(moved distance: CGPoint) {
         guard let viceThread = viceThread else { return }
         viceThread.mouseX = (viceThread.mouseX + Int32(distance.x)) & 0xffff
@@ -277,7 +267,7 @@ extension JoystickButtons {
         case .freeze:
             cartridge_trigger_freeze()
             
-        case .joystick(let port, let buttons):
+        case .joystick(let port, let buttons, _):
             joystick_set_value_absolute(UInt32(port), UInt8(buttons.value))
             
         case .key(let key, pressed: let pressed):
diff --git a/res/Hardware Parts.afdesign b/res/Hardware Parts.afdesign
index 5848c1d8..981bdc03 100644
Binary files a/res/Hardware Parts.afdesign and b/res/Hardware Parts.afdesign differ
diff --git a/res/Icon ZX-128.afdesign b/res/Icon ZX-128.afdesign
new file mode 100644
index 00000000..6e9dcaf2
Binary files /dev/null and b/res/Icon ZX-128.afdesign differ