diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
new file mode 100644
index 000000000..1a1d89422
--- /dev/null
+++ b/.vscode/c_cpp_properties.json
@@ -0,0 +1,83 @@
+{
+    "configurations": [
+        {
+            "name": "Mac",
+            "includePath": [
+                "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1",
+                "/usr/local/include",
+                "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/9.0.0/include",
+                "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
+                "/usr/include",
+                "${workspaceRoot}",
+                "${workspaceRoot}/src/common",
+                "${workspaceRoot}/src/common/tv_filters",
+                "${workspaceRoot}/src/gui",
+                "${workspaceRoot}/src/emucore",
+                "${workspaceRoot}/src/emucore/tia",
+                "${workspaceRoot}/src/unix",
+                "${workspaceRoot}/src/debugger",
+                "${workspaceRoot}/src/debugger/gui",
+                "${workspaceRoot}/src/cheat",
+                "/usr/local/include/SDL2"
+            ],
+            "defines": ["DEBUGGER_SUPPORT"],
+            "intelliSenseMode": "clang-x64",
+            "browse": {
+                "path": [
+                    "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1",
+                    "/usr/local/include",
+                    "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/9.0.0/include",
+                    "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
+                    "/usr/include",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            },
+            "macFrameworkPath": [
+                "/System/Library/Frameworks",
+                "/Library/Frameworks"
+            ]
+        },
+        {
+            "name": "Linux",
+            "includePath": [
+                "/usr/include",
+                "/usr/local/include",
+                "${workspaceRoot}"
+            ],
+            "defines": [],
+            "intelliSenseMode": "clang-x64",
+            "browse": {
+                "path": [
+                    "/usr/include",
+                    "/usr/local/include",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            }
+        },
+        {
+            "name": "Win32",
+            "includePath": [
+                "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/include",
+                "${workspaceRoot}"
+            ],
+            "defines": [
+                "_DEBUG",
+                "UNICODE"
+            ],
+            "intelliSenseMode": "msvc-x64",
+            "browse": {
+                "path": [
+                    "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/include/*",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            }
+        }
+    ],
+    "version": 3
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 94f1f7797..857d47127 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,23 +1,16 @@
 // Platzieren Sie Ihre Einstellungen in dieser Datei, um Standard- und Benutzereinstellungen zu überschreiben.
 {
-        "clang.cxxflags": [
-            "-std=c++11",
-            "-I/home/cnspeckn/git/stella/src/common",
-            "-I/home/cnspeckn/git/stella/src/emucore",
-            "-I/home/cnspeckn/git/stella/src/emucore/tia",
-            "-I/home/cnspeckn/git/stella/src/debugger",
-            "-I/home/cnspeckn/git/stella/src/debugger/gui",
-            "-I/home/cnspeckn/git/stella/src/gui"
-        ],
-        "editor.tabSize": 2,
-        "files.trimTrailingWhitespace": true,
-        "files.exclude": {
-            "**/.git": true,
-            "**/.svn": true,
-            "**/.hg": true,
-            "**/.DS_Store": true,
-            "src/**/*.o": true
-        },
-        "editor.trimAutoWhitespace": true,
-        "editor.useTabStops": false
-}
\ No newline at end of file
+    "editor.tabSize": 2,
+    "files.trimTrailingWhitespace": true,
+    "files.exclude": {
+        "**/.git": true,
+        "**/.svn": true,
+        "**/.hg": true,
+        "**/.DS_Store": true,
+        "src/**/*.o": true
+    },
+    "editor.trimAutoWhitespace": true,
+    "editor.useTabStops": false,
+    "C_Cpp.intelliSenseEngine": "Default",
+    "files.insertFinalNewline": true
+}