diff --git a/.gitignore b/.gitignore
index e7ccfdf..5d164ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,35 @@
-.build
-timeline.xctimeline
+## Build generated
+build/
+DerivedData/
 
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+
+## Other
+*.moved-aside
+*.xcuserstate
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+*.dSYM.zip
+*.dSYM
+
+## Playgrounds
+timeline.xctimeline
+playground.xcworkspace
+
+## Swift Package Manager
+Packages/
+.build/
+
+## Carthage
+Carthage/Build
diff --git a/Surge.xcodeproj/xcuserdata/Robert.xcuserdatad/xcschemes/xcschememanagement.plist b/Surge.xcodeproj/xcuserdata/Robert.xcuserdatad/xcschemes/xcschememanagement.plist
deleted file mode 100644
index 7418abf..0000000
--- a/Surge.xcodeproj/xcuserdata/Robert.xcuserdatad/xcschemes/xcschememanagement.plist
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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>SchemeUserState</key>
-	<dict>
-		<key>Surge.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-	<key>SuppressBuildableAutocreation</key>
-	<dict>
-		<key>F84A6AAD19A9A72F007B53E1</key>
-		<dict>
-			<key>primary</key>
-			<true/>
-		</dict>
-		<key>F8A1E1A919917A79009735E2</key>
-		<dict>
-			<key>primary</key>
-			<true/>
-		</dict>
-	</dict>
-</dict>
-</plist>
diff --git a/Surge.xcodeproj/xcuserdata/leonardthomas.xcuserdatad/xcschemes/xcschememanagement.plist b/Surge.xcodeproj/xcuserdata/leonardthomas.xcuserdatad/xcschemes/xcschememanagement.plist
deleted file mode 100644
index a127e8d..0000000
--- a/Surge.xcodeproj/xcuserdata/leonardthomas.xcuserdatad/xcschemes/xcschememanagement.plist
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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>SuppressBuildableAutocreation</key>
-	<dict>
-		<key>F84A6AAD19A9A72F007B53E1</key>
-		<dict>
-			<key>primary</key>
-			<true/>
-		</dict>
-		<key>F8A1E1A919917A79009735E2</key>
-		<dict>
-			<key>primary</key>
-			<true/>
-		</dict>
-	</dict>
-</dict>
-</plist>
diff --git a/Surge.xcworkspace/xcuserdata/Robert.xcuserdatad/UserInterfaceState.xcuserstate b/Surge.xcworkspace/xcuserdata/Robert.xcuserdatad/UserInterfaceState.xcuserstate
deleted file mode 100644
index b7f9fce..0000000
Binary files a/Surge.xcworkspace/xcuserdata/Robert.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ
diff --git a/Surge.xcworkspace/xcuserdata/leonardthomas.xcuserdatad/UserInterfaceState.xcuserstate b/Surge.xcworkspace/xcuserdata/leonardthomas.xcuserdatad/UserInterfaceState.xcuserstate
deleted file mode 100644
index 0213baa..0000000
Binary files a/Surge.xcworkspace/xcuserdata/leonardthomas.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ
diff --git a/Surge.xcworkspace/xcuserdata/leonardthomas.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Surge.xcworkspace/xcuserdata/leonardthomas.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
deleted file mode 100644
index ed9a9b4..0000000
--- a/Surge.xcworkspace/xcuserdata/leonardthomas.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Bucket
-   type = "0"
-   version = "2.0">
-</Bucket>