diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 000000000..d1d007e5e
Binary files /dev/null and b/.DS_Store differ
diff --git a/Assets/.DS_Store b/Assets/.DS_Store
new file mode 100644
index 000000000..b0aeabcd2
Binary files /dev/null and b/Assets/.DS_Store differ
diff --git a/Assets/Plugins/.DS_Store b/Assets/Plugins/.DS_Store
new file mode 100644
index 000000000..247bd0933
Binary files /dev/null and b/Assets/Plugins/.DS_Store differ
diff --git a/Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.dylib.meta b/Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.dylib.meta
index bd41dce5c..5e236fa85 100644
--- a/Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.dylib.meta
+++ b/Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.dylib.meta
@@ -11,6 +11,24 @@ PluginImporter:
   isExplicitlyReferenced: 0
   validateReferences: 1
   platformData:
+  - first:
+      : Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 0
+        Exclude Editor: 0
+        Exclude Linux64: 0
+        Exclude OSXUniversal: 0
+        Exclude Win: 0
+        Exclude Win64: 0
+        Exclude iOS: 0
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings:
+        CPU: ARMv7
   - first:
       Any: 
     second:
@@ -19,10 +37,11 @@ PluginImporter:
   - first:
       Editor: Editor
     second:
-      enabled: 0
+      enabled: 1
       settings:
         CPU: x86_64
         DefaultValueInitialized: true
+        OS: AnyOS
   - first:
       Standalone: Linux64
     second:
@@ -32,13 +51,13 @@ PluginImporter:
   - first:
       Standalone: OSXUniversal
     second:
-      enabled: 0
+      enabled: 1
       settings:
-        CPU: x86_64
+        CPU: AnyCPU
   - first:
       Standalone: Win
     second:
-      enabled: 0
+      enabled: 1
       settings:
         CPU: None
   - first:
@@ -47,6 +66,15 @@ PluginImporter:
       enabled: 1
       settings:
         CPU: AnyCPU
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 1
+      settings:
+        AddToEmbeddedBinaries: false
+        CPU: AnyCPU
+        CompileFlags: 
+        FrameworkDependencies: 
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/Assets/Plugins/JSL/.DS_Store b/Assets/Plugins/JSL/.DS_Store
new file mode 100644
index 000000000..1b887eaf3
Binary files /dev/null and b/Assets/Plugins/JSL/.DS_Store differ
diff --git a/Assets/Plugins/JSL/x64/libJoyShockLibrary.dylib b/Assets/Plugins/JSL/x64/libJoyShockLibrary.dylib
new file mode 100755
index 000000000..1b1754375
Binary files /dev/null and b/Assets/Plugins/JSL/x64/libJoyShockLibrary.dylib differ
diff --git a/Assets/Plugins/JSL/x64/libJoyShockLibrary.dylib.meta b/Assets/Plugins/JSL/x64/libJoyShockLibrary.dylib.meta
new file mode 100644
index 000000000..5a7b8b719
--- /dev/null
+++ b/Assets/Plugins/JSL/x64/libJoyShockLibrary.dylib.meta
@@ -0,0 +1,80 @@
+fileFormatVersion: 2
+guid: 53ce567e644ef4880b1db00e550aa797
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 1
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      : Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 0
+        Exclude Editor: 0
+        Exclude Linux64: 1
+        Exclude OSXUniversal: 0
+        Exclude Win: 1
+        Exclude Win64: 1
+        Exclude iOS: 0
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings:
+        CPU: ARMv7
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: x86_64
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 1
+      settings:
+        AddToEmbeddedBinaries: false
+        CPU: AnyCPU
+        CompileFlags: 
+        FrameworkDependencies: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Plugins/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle.meta b/Assets/Plugins/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle.meta
index c7bdac63d..28ccd3843 100644
--- a/Assets/Plugins/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle.meta
+++ b/Assets/Plugins/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle.meta
@@ -6,9 +6,30 @@ PluginImporter:
   serializedVersion: 2
   iconMap: {}
   executionOrder: {}
+  defineConstraints: []
   isPreloaded: 0
   isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
   platformData:
+  - first:
+      : Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 0
+        Exclude Linux64: 1
+        Exclude OSXUniversal: 0
+        Exclude Win: 1
+        Exclude Win64: 1
+        Exclude iOS: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 0
+      settings:
+        CPU: ARMv7
   - first:
       Any: 
     second:
@@ -19,7 +40,15 @@ PluginImporter:
     second:
       enabled: 1
       settings:
+        CPU: AnyCPU
         DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
   - first:
       Standalone: OSXIntel
     second:
@@ -34,7 +63,29 @@ PluginImporter:
       Standalone: OSXUniversal
     second:
       enabled: 1
-      settings: {}
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: x86_64
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 0
+      settings:
+        AddToEmbeddedBinaries: false
+        CPU: AnyCPU
+        CompileFlags: 
+        FrameworkDependencies: 
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/Assets/Plugins/VorbisPlugin/Plugins/OSX/libVorbisPlugin.dylib b/Assets/Plugins/VorbisPlugin/Plugins/OSX/libVorbisPlugin.dylib
old mode 100644
new mode 100755
index ba3b0e34c..3a247d6ce
Binary files a/Assets/Plugins/VorbisPlugin/Plugins/OSX/libVorbisPlugin.dylib and b/Assets/Plugins/VorbisPlugin/Plugins/OSX/libVorbisPlugin.dylib differ
diff --git a/Assets/Plugins/VorbisPlugin/Plugins/OSX/libVorbisPlugin.dylib.meta b/Assets/Plugins/VorbisPlugin/Plugins/OSX/libVorbisPlugin.dylib.meta
index 17b9f12ce..8c98b95c3 100644
--- a/Assets/Plugins/VorbisPlugin/Plugins/OSX/libVorbisPlugin.dylib.meta
+++ b/Assets/Plugins/VorbisPlugin/Plugins/OSX/libVorbisPlugin.dylib.meta
@@ -6,7 +6,7 @@ PluginImporter:
   iconMap: {}
   executionOrder: {}
   defineConstraints: []
-  isPreloaded: 0
+  isPreloaded: 1
   isOverridable: 0
   isExplicitlyReferenced: 0
   validateReferences: 1
@@ -16,23 +16,23 @@ PluginImporter:
     second:
       enabled: 0
       settings:
-        Exclude Android: 1
+        Exclude Android: 0
         Exclude Editor: 0
         Exclude Linux64: 1
         Exclude OSXUniversal: 0
         Exclude Win: 1
         Exclude Win64: 1
-        Exclude iOS: 1
+        Exclude iOS: 0
   - first:
       Android: Android
     second:
-      enabled: 0
+      enabled: 1
       settings:
         CPU: ARMv7
   - first:
       Any: 
     second:
-      enabled: 0
+      enabled: 1
       settings: {}
   - first:
       Editor: Editor
@@ -41,7 +41,7 @@ PluginImporter:
       settings:
         CPU: AnyCPU
         DefaultValueInitialized: true
-        OS: OSX
+        OS: AnyOS
   - first:
       Standalone: Linux64
     second:
@@ -69,7 +69,7 @@ PluginImporter:
   - first:
       iPhone: iOS
     second:
-      enabled: 0
+      enabled: 1
       settings:
         AddToEmbeddedBinaries: false
         CPU: AnyCPU
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/Lockstep.psd b/Assets/Resources/Sprites/Editor/GameIcons/Lockstep.psd
deleted file mode 100644
index 0730e4182..000000000
Binary files a/Assets/Resources/Sprites/Editor/GameIcons/Lockstep.psd and /dev/null differ
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers_mask.png.meta
index c50a99ab7..9714e5594 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/Tram&Pauline_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/Tram&Pauline_mask.png.meta
index 7e41cb2c9..937e9ef97 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/Tram&Pauline_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/Tram&Pauline_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/airRally_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/airRally_mask.png.meta
index 362f4572c..63e5182be 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/airRally_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/airRally_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/blueBear_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/blueBear_mask.png.meta
index 17d4470a8..b2a28c425 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/blueBear_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/blueBear_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS_mask.png.meta
index 47ce7888f..6ee171ef6 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/catchyTune_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/catchyTune_mask.png.meta
index 6aa8b5037..54be39642 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/catchyTune_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/catchyTune_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/cheerReaders_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/cheerReaders_mask.png.meta
index 3ad233574..f908219aa 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/cheerReaders_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/cheerReaders_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/clappyTrio_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/clappyTrio_mask.png.meta
index 7155cc079..e257eb23d 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/clappyTrio_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/clappyTrio_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
@@ -65,7 +65,7 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 128
+    maxTextureSize: 256
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 0
@@ -77,7 +77,7 @@ TextureImporter:
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Standalone
-    maxTextureSize: 128
+    maxTextureSize: 256
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/coinToss_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/coinToss_mask.png.meta
index 16eaa707a..52ac9e5b6 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/coinToss_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/coinToss_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/countIn_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/countIn_mask.png.meta
index 525c2ab51..498eda64f 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/countIn_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/countIn_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/cropStomp_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/cropStomp_mask.png.meta
index 0fd1c7301..04eb06c94 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/cropStomp_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/cropStomp_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/djSchool_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/djSchool_mask.png.meta
index 1f00d74a3..5cbecebf5 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/djSchool_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/djSchool_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/doubleDate_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/doubleDate_mask.png.meta
index 0fa70b09f..c2de5d895 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/doubleDate_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/doubleDate_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/drummingPractice_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/drummingPractice_mask.png.meta
index e9c981666..8dd3a0f26 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/drummingPractice_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/drummingPractice_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/fanClub_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/fanClub_mask.png.meta
index aaadd40f0..1065a323b 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/fanClub_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/fanClub_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/fireworks_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/fireworks_mask.png.meta
index 2f9b868a9..16bc79bb8 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/fireworks_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/fireworks_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/firstContact_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/firstContact_mask.png.meta
index e11e94627..80ac0703d 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/firstContact_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/firstContact_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/forkLifter_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/forkLifter_mask.png.meta
index 31b1ba14e..2f98875d0 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/forkLifter_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/forkLifter_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/gameManager_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/gameManager_mask.png.meta
index 810640bfa..f5d7d3800 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/gameManager_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/gameManager_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/karateman_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/karateman_mask.png.meta
index c21e315b3..b9bd1414c 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/karateman_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/karateman_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/kitties_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/kitties_mask.png.meta
index 49767ed7e..72070f92d 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/kitties_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/kitties_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/launch party_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/launch party_mask.png.meta
index 065d6f5b3..87321c68c 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/launch party_mask.png.meta	
+++ b/Assets/Resources/Sprites/Editor/GameIcons/launch party_mask.png.meta	
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/lockstep.png b/Assets/Resources/Sprites/Editor/GameIcons/lockstep.png
new file mode 100644
index 000000000..b0019e359
Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/lockstep.png differ
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/Lockstep.psd.meta b/Assets/Resources/Sprites/Editor/GameIcons/lockstep.png.meta
similarity index 83%
rename from Assets/Resources/Sprites/Editor/GameIcons/Lockstep.psd.meta
rename to Assets/Resources/Sprites/Editor/GameIcons/lockstep.png.meta
index 34a4b3372..9cdc7ec9e 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/Lockstep.psd.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/lockstep.png.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 79d3e6e721ef3244bba23ae05e0d4237
+guid: 15f5caa0ec3a8ec49a617d894b7e7c54
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -65,10 +65,22 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 256
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/lockstep_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/lockstep_mask.png.meta
index 44fe5c4fe..da2f17a8b 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/lockstep_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/lockstep_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
@@ -65,10 +65,22 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 256
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/marchingOrders_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/marchingOrders_mask.png.meta
index 13390a376..cfd5995bf 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/marchingOrders_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/marchingOrders_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat_mask.png.meta
index 904b74e1e..3ae1af8a3 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/pajamaParty.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/pajamaParty.png.meta
index 7cac1d396..db3b7136f 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/pajamaParty.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/pajamaParty.png.meta
@@ -68,7 +68,7 @@ TextureImporter:
     maxTextureSize: 256
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 1
+    textureCompression: 0
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
@@ -80,7 +80,7 @@ TextureImporter:
     maxTextureSize: 256
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 1
+    textureCompression: 0
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/pajamaParty_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/pajamaParty_mask.png.meta
index cdfc2f60d..6954b488b 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/pajamaParty_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/pajamaParty_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/rhythmRally_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/rhythmRally_mask.png.meta
index 30b4f9373..e5c57096a 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/rhythmRally_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/rhythmRally_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/rhythmSomen.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/rhythmSomen.png.meta
index ddcf59f12..b17481311 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/rhythmSomen.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/rhythmSomen.png.meta
@@ -68,7 +68,7 @@ TextureImporter:
     maxTextureSize: 256
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 1
+    textureCompression: 0
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
@@ -80,7 +80,7 @@ TextureImporter:
     maxTextureSize: 256
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 1
+    textureCompression: 0
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/rhythmSomen_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/rhythmSomen_mask.png.meta
index e8edd9abf..0c366570c 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/rhythmSomen_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/rhythmSomen_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/samuraiSliceNtr.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/samuraiSliceNtr.png.meta
index 7814497c3..7253e7550 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/samuraiSliceNtr.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/samuraiSliceNtr.png.meta
@@ -68,7 +68,7 @@ TextureImporter:
     maxTextureSize: 256
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 1
+    textureCompression: 0
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
@@ -80,7 +80,7 @@ TextureImporter:
     maxTextureSize: 256
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 1
+    textureCompression: 0
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/samuraiSliceNtr_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/samuraiSliceNtr_mask.png.meta
index dd8f969f7..65a41e2bf 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/samuraiSliceNtr_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/samuraiSliceNtr_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/sneakySpirits_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/sneakySpirits_mask.png.meta
index 487daa06e..a8f42a4ec 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/sneakySpirits_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/sneakySpirits_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/spaceDance_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/spaceDance_mask.png.meta
index 28f0115fb..c4dab0caf 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/spaceDance_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/spaceDance_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/spaceSoccer_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/spaceSoccer_mask.png.meta
index 17ee5f568..66ce787cb 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/spaceSoccer_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/spaceSoccer_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/spaceball_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/spaceball_mask.png.meta
index 41d5e1e8a..b83538b29 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/spaceball_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/spaceball_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/tapTrial_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/tapTrial_mask.png.meta
index 216c30a16..98e97abca 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/tapTrial_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/tapTrial_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/trickClass_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/trickClass_mask.png.meta
index 2a9bbbc0f..816c78c7b 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/trickClass_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/trickClass_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/tunnel_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/tunnel_mask.png.meta
index 6cfd05590..10707c4c7 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/tunnel_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/tunnel_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/vfx_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/vfx_mask.png.meta
index 915d90149..0acd9283d 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/vfx_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/vfx_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz_mask.png.meta
index cc5d3578b..18c7c557b 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz_mask.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz_mask.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/workingDough.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/workingDough.png.meta
index b0e84643d..2e063f676 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/workingDough.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/workingDough.png.meta
@@ -65,10 +65,22 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 256
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
diff --git a/Assets/Scripts/.DS_Store b/Assets/Scripts/.DS_Store
new file mode 100644
index 000000000..8243e0645
Binary files /dev/null and b/Assets/Scripts/.DS_Store differ
diff --git a/Assets/Scripts/InputSystem/PlayerInput.cs b/Assets/Scripts/InputSystem/PlayerInput.cs
index ec7ac6592..265c112a4 100644
--- a/Assets/Scripts/InputSystem/PlayerInput.cs
+++ b/Assets/Scripts/InputSystem/PlayerInput.cs
@@ -14,17 +14,17 @@ namespace HeavenStudio
         public const int RIGHT = 1;
         public const int DOWN = 2;
         public const int LEFT = 3;
-
+        
         ///////////////////////////////
         ////TEMPORARY JSL FUNCTIONS////
         ///////////////////////////////
-
+        
         static int jslDevicesFound = 0;
         static int jslDevicesConnected = 0;
         static int[] jslDeviceHandles;
-
+        
         static List<InputController> inputDevices;
-
+        
         public static int InitInputControllers()
         {
             inputDevices = new List<InputController>();
@@ -34,11 +34,11 @@ namespace HeavenStudio
             keyboard.InitializeController();
             inputDevices.Add(keyboard);
             //end Keyboard setup
-
+            
             //JoyShock setup
             Debug.Log("Flushing possible JoyShocks...");
             DisconnectJoyshocks();
-
+            
             jslDevicesFound = JslConnectDevices();
             if (jslDevicesFound > 0)
             {
@@ -53,7 +53,7 @@ namespace HeavenStudio
                     Debug.Log("Found " + jslDevicesFound + " JoyShocks.");
                     Debug.Log("Connected " + jslDevicesConnected + " JoyShocks.");
                 }
-
+                
                 foreach (int i in jslDeviceHandles)
                 {
                     Debug.Log("Setting up JoyShock: ( Handle " + i + ", type " + JslGetControllerType(i) + " )");
@@ -68,25 +68,36 @@ namespace HeavenStudio
                 Debug.Log("No JoyShocks found.");
             }
             //end JoyShock setup
-
+            
             //TODO: XInput setup (boo)
             //end XInput setup
-
+            
             return inputDevices.Count;
         }
-
+        
         public static int GetNumControllersConnected()
         {
             return inputDevices.Count;
         }
-
+        
         public static List<InputController> GetInputControllers()
         {
             return inputDevices;
         }
-
+        
         public static InputController GetInputController(int player)
         {
+            // Needed so Keyboard works on MacOS
+            #if UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX
+            inputDevices = new List<InputController>();
+            if(inputDevices.Count < 1)
+            {
+                InputKeyboard keyboard = new InputKeyboard();
+                keyboard.SetPlayer(1);
+                keyboard.InitializeController();
+                inputDevices.Add(keyboard);
+            }
+            #endif
             //select input controller that has player field set to player
             //this will return the first controller that has that player number in the case of controller pairs (eg. Joy-Cons)
             //so such controllers should have a reference to the other controller in the pair
@@ -99,13 +110,26 @@ namespace HeavenStudio
             }
             return null;
         }
-
+        
         public static int GetInputControllerId(int player)
         {
             //select input controller id that has player field set to player
             //this will return the first controller that has that player number in the case of controller pairs (eg. Joy-Cons)
             //so such controllers should have a reference to the other controller in the pair
             //controller IDs are determined by connection order (the Keyboard is always first)
+            
+            
+            // Needed so Keyboard works on MacOS
+            #if UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX
+            inputDevices = new List<InputController>();
+            if(inputDevices.Count < 1)
+            {
+                InputKeyboard keyboard = new InputKeyboard();
+                keyboard.SetPlayer(1);
+                keyboard.InitializeController();
+                inputDevices.Add(keyboard);
+            }
+            #endif
             for (int i = 0; i < inputDevices.Count; i++)
             {
                 if (inputDevices[i].GetPlayer() == player)
@@ -115,15 +139,26 @@ namespace HeavenStudio
             }
             return -1;
         }
-
+        
         public static void UpdateInputControllers()
         {
+            // Needed so Keyboard works on MacOS
+            #if UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX
+            inputDevices = new List<InputController>();
+            if(inputDevices.Count < 1)
+            {
+                InputKeyboard keyboard = new InputKeyboard();
+                keyboard.SetPlayer(1);
+                keyboard.InitializeController();
+                inputDevices.Add(keyboard);
+            }
+            #endif
             foreach (InputController i in inputDevices)
             {
                 i.UpdateState();
             }
         }
-
+        
         public static void DisconnectJoyshocks()
         {
             if (jslDeviceHandles != null && jslDevicesConnected > 0 && jslDeviceHandles.Length > 0)
@@ -141,7 +176,7 @@ namespace HeavenStudio
             jslDevicesFound = 0;
             jslDevicesConnected = 0;
         }
-
+        
         // The autoplay isn't activated AND
         // The song is actually playing AND
         // The GameManager allows you to Input
@@ -149,99 +184,99 @@ namespace HeavenStudio
         {
             return !GameManager.instance.autoplay && Conductor.instance.isPlaying && GameManager.instance.canInput;
         }
-
+        
         /*--------------------*/
         /* MAIN INPUT METHODS */
         /*--------------------*/
-
+        
         // BUTTONS
         //TODO: refactor for controller and custom binds, currently uses temporary button checks
-
+        
         public static bool Pressed(bool includeDPad = false)
         {
             bool keyDown = GetInputController(1).GetButtonDown((int) InputController.ButtonsPad.PadE) || (includeDPad && GetAnyDirectionDown());
             return keyDown && !GameManager.instance.autoplay && Conductor.instance.isPlaying && GameManager.instance.canInput ;
         }
-
+        
         public static bool PressedUp(bool includeDPad = false)
         {
             bool keyUp = GetInputController(1).GetButtonUp((int) InputController.ButtonsPad.PadE) || (includeDPad && GetAnyDirectionUp());
             return keyUp && !GameManager.instance.autoplay && Conductor.instance.isPlaying && GameManager.instance.canInput;
         }
-
+        
         public static bool Pressing(bool includeDPad = false)
         {
             bool pressing = GetInputController(1).GetButton((int) InputController.ButtonsPad.PadE) || (includeDPad && GetAnyDirection());
             return pressing && !GameManager.instance.autoplay && Conductor.instance.isPlaying && GameManager.instance.canInput;
         }
-
-
+        
+        
         public static bool AltPressed()
         {
             bool down = GetInputController(1).GetButtonDown((int) InputController.ButtonsPad.PadS);
             return down && playerHasControl();
         }
-
+        
         public static bool AltPressedUp()
         {
             bool up = GetInputController(1).GetButtonUp((int) InputController.ButtonsPad.PadS);
             return up && playerHasControl();
         }
-
+        
         public static bool AltPressing()
         {
             bool pressing = GetInputController(1).GetButton((int) InputController.ButtonsPad.PadS);
             return pressing && playerHasControl();
         }
-
+        
         //Directions
-
+        
         public static bool GetAnyDirectionDown()
         {
             InputController c = GetInputController(1);
             return (c.GetHatDirectionDown((InputController.InputDirection) UP)
-                    || c.GetHatDirectionDown((InputController.InputDirection) DOWN)
-                    || c.GetHatDirectionDown((InputController.InputDirection) LEFT)
-                    || c.GetHatDirectionDown((InputController.InputDirection) RIGHT)
-                    ) && playerHasControl();
-
+            || c.GetHatDirectionDown((InputController.InputDirection) DOWN)
+            || c.GetHatDirectionDown((InputController.InputDirection) LEFT)
+            || c.GetHatDirectionDown((InputController.InputDirection) RIGHT)
+            ) && playerHasControl();
+            
         }
-
+        
         public static bool GetAnyDirectionUp()
         {
             InputController c = GetInputController(1);
             return (c.GetHatDirectionUp((InputController.InputDirection) UP)
-                    || c.GetHatDirectionUp((InputController.InputDirection) DOWN)
-                    || c.GetHatDirectionUp((InputController.InputDirection) LEFT)
-                    || c.GetHatDirectionUp((InputController.InputDirection) RIGHT)
-                    ) && playerHasControl();
-
+            || c.GetHatDirectionUp((InputController.InputDirection) DOWN)
+            || c.GetHatDirectionUp((InputController.InputDirection) LEFT)
+            || c.GetHatDirectionUp((InputController.InputDirection) RIGHT)
+            ) && playerHasControl();
+            
         }
-
+        
         public static bool GetAnyDirection()
         {
             InputController c = GetInputController(1);
             return (c.GetHatDirection((InputController.InputDirection) UP)
-                    || c.GetHatDirection((InputController.InputDirection) DOWN)
-                    || c.GetHatDirection((InputController.InputDirection) LEFT)
-                    || c.GetHatDirection((InputController.InputDirection) RIGHT)
-                    ) && playerHasControl();
-
+            || c.GetHatDirection((InputController.InputDirection) DOWN)
+            || c.GetHatDirection((InputController.InputDirection) LEFT)
+            || c.GetHatDirection((InputController.InputDirection) RIGHT)
+            ) && playerHasControl();
+            
         }
-
+        
         public static bool GetSpecificDirection(int direction)
         {
             return GetInputController(1).GetHatDirection((InputController.InputDirection) direction) && playerHasControl();
         }
-
+        
         public static bool GetSpecificDirectionDown(int direction)
         {
             return GetInputController(1).GetHatDirectionDown((InputController.InputDirection) direction) && playerHasControl();
         }
-
+        
         public static bool GetSpecificDirectionUp(int direction)
         {
             return GetInputController(1).GetHatDirectionUp((InputController.InputDirection) direction) && playerHasControl();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/README.md b/README.md
index 56e998b01..ce1e83d2e 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,8 @@ This project is still in development, so there are currently no release builds y
 - [MacOS](https://nightly.link/megaminerjenny/HeavenStudio/workflows/main/master/StandaloneOSX-build.zip)
 
 ## Self-Building
-#### Note: Mac-OS and Linux-based builds are not fully tested, you may [experience bugs with audio-related tasks](https://github.com/megaminerjenny/HeavenStudio/issues/72).
+#### Note: MacOS and Linux-based builds are not fully tested, you may [experience bugs with audio-related tasks](https://github.com/megaminerjenny/HeavenStudio/issues/72).
+#### Note: on MacOS, You need to [set the app as executable by yourself](https://cdn.discordapp.com/attachments/954121092564402207/1060769484278861844/IMG_6336.jpg).
 Heaven Studio is made in [Unity 2020.3.25f1](https://unity3d.com/unity/whats-new/2020.3.25),
 and programmed with [Visual Studio Code](https://code.visualstudio.com/).