diff --git a/.clang-format b/.clang-format
index 60bd33c2a..c144259b3 100644
--- a/.clang-format
+++ b/.clang-format
@@ -2,7 +2,7 @@
 BasedOnStyle: LLVM
 ColumnLimit: 120
 UseTab: Never
-TabWidth: 4
+TabWidth: 2
 ---
 Language: Cpp
 DerivePointerAlignment: false
@@ -10,11 +10,11 @@ PointerAlignment: Left
 AlignAfterOpenBracket: Align
 AlignConsecutiveAssignments: false
 IndentCaseLabels: false
-AllowShortBlocksOnASingleLine: true
+AllowShortBlocksOnASingleLine: Always
 AlignOperands: true
 AlignTrailingComments: true
 AlwaysBreakBeforeMultilineStrings: true
-AlwaysBreakTemplateDeclarations: true
+AlwaysBreakTemplateDeclarations: Yes
 BreakConstructorInitializersBeforeComma: true
 AlwaysBreakAfterReturnType: None
 AlwaysBreakAfterDefinitionReturnType: None
@@ -26,4 +26,4 @@ BinPackParameters: true
 SortIncludes: false
 AccessModifierOffset: -2
 ConstructorInitializerIndentWidth: 0
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
\ No newline at end of file
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
diff --git a/.clang-tidy b/.clang-tidy
index a3c98d4fa..7533dea0b 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1 +1 @@
-Checks: '*,-misc-unused-parameters,-modernize-use-trailing-return-type,-readability-named-parameter,-readability-convert-member-functions-to-static,-readability-uppercase-literal-suffix,-readability-magic-numbers,-hicpp-uppercase-literal-suffix,-hicpp-signed-bitwise,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-bounds-constant-array-index,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-type-union-access,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-non-private-member-variables-in-classes,-fuchsia-*,-google-runtime-references'
+Checks: '*,-misc-unused-parameters,-modernize-use-trailing-return-type,-readability-named-parameter,-readability-convert-member-functions-to-static,-readability-uppercase-literal-suffix,-readability-magic-numbers,-hicpp-uppercase-literal-suffix,-hicpp-signed-bitwise,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-bounds-constant-array-index,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-type-union-access,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-non-private-member-variables-in-classes,-fuchsia-*,-google-runtime-references,-llvmlibc-*'
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index c65d9f828..000000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/Editor/locale" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/NESEmulator/fixNES" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/amuse" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/assetnameparser/tinyxml2" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/discord-rpc" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/hecl" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/hecl-gui" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/hecl/extern/athena" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/hecl/extern/athena/extern/fmt" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/hecl/extern/athena/extern/lzokay" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/hecl/extern/boo" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/hecl/extern/boo/glslang" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/hecl/extern/boo/lib/graphicsdev/nx/libdrm_nouveau" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/hecl/extern/boo/lib/graphicsdev/nx/mesa" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/hecl/extern/boo/logvisor" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/hecl/extern/boo/logvisor/fmt" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/hecl/extern/libSquish" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/hecl/extern/libjpeg-turbo" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/jbus" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/kabufuda" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/nod" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/nod/logvisor" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/nod/logvisor/fmt" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/rapidjson" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/rapidjson/thirdparty/gtest" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/sanitizers-cmake" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/specter" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/specter/freetype2" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/specter/zeus" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file