diff --git a/settings.json b/settings.json
index 2446c94..efce9bd 100644
--- a/settings.json
+++ b/settings.json
@@ -1,8 +1,8 @@
 {
     "editor.tabSize": 2,
-    "[cpp]": {
-        "editor.defaultFormatter": "ms-vscode.cpptools"
-    },
+    // "[cpp]": {
+    //     "editor.defaultFormatter": "ms-vscode.cpptools"
+    // },
     "editor.rulers": [
         80
     ],
@@ -120,12 +120,8 @@
     "workbench.tree.indent": 28,
     "workbench.tree.renderIndentGuides": "always",
     "systemverilog.maxLineCountIndexing": 1000000,
-    "C_Cpp.clang_format_fallbackStyle": "google",
-    "C_Cpp.clang_format_style": "google",
     "cmake.configureOnEdit": false,
-    "window.zoomLevel": 1.2,
-    "editor.minimap.showSlider": "always",
-    "editor.minimap.renderCharacters": false,
+    "window.zoomLevel": 0.6,
     "editor.autoClosingBrackets": "never",
     "editor.autoClosingQuotes": "never",
     "editor.autoClosingOvertype": "never",
@@ -158,7 +154,7 @@
         "workbench.action.tasks.configureTaskRunner",
         "workbench.action.tasks.runTask"
     ],
-    "diffEditor.ignoreTrimWhitespace": true,
+    "diffEditor.ignoreTrimWhitespace": false,
     "editor.stickyScroll.enabled": false,
     "continue.showInlineTip": false,
     "explorer.confirmDragAndDrop": false,
@@ -169,7 +165,13 @@
     "continue.enableTabAutocomplete": false,
     "makefile.configureOnOpen": true,
     "editor.accessibilitySupport": "off",
-    "workbench.statusBar.visible": false,
     "extensions.autoCheckUpdates": false,
     "extensions.autoUpdate": false,
+    "editor.minimap.renderCharacters": false,
+    "editor.minimap.showSlider": "always",
+    "C_Cpp.clang_format_style": "{BasedOnStyle: google, ColumnLimit: 120}",
+    "C_Cpp.clang_format_fallbackStyle": "{BasedOnStyle: google, ColumnLimit: 120}",
+    "editor.defaultFormatter": "xaver.clang-format",
+    "clang-format.style": "{BasedOnStyle: google, ColumnLimit: 120}",
+    "workbench.statusBar.visible": false
 }
\ No newline at end of file