diff --git a/.gitignore b/.gitignore
index 43c42d1..7232f09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,9 @@ Main - Copy.cpp
 old/**
 asm/
 
+# Removed this, it is user specific.
+imgui.ini
+
 # ---> C++
 # Prerequisites
 *.d
diff --git a/KCNet-ImGui-Test.vcxproj b/KCNet-ImGui-Test.vcxproj
index 5b035f6..fb6421d 100644
--- a/KCNet-ImGui-Test.vcxproj
+++ b/KCNet-ImGui-Test.vcxproj
@@ -212,6 +212,7 @@
     <ClCompile>
       <AdditionalIncludeDirectories>lib\imgui\;lib\imgui\backends;.\src;.\src\test;.\src\util\;.\src\functions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DIRECTX9</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -236,6 +237,8 @@
     <ClCompile Include="lib\ImGui\imgui_tables.cpp" />
     <ClCompile Include="lib\ImGui\imgui_widgets.cpp" />
     <ClCompile Include="src\menus\main_menu.cpp" />
+    <ClCompile Include="src\menus\test_menu1.cpp" />
+    <ClCompile Include="src\menus\test_menu2.cpp" />
     <ClCompile Include="src\menus\text_menu.cpp" />
     <ClCompile Include="src\menus\vice_city_menu.cpp" />
     <ClCompile Include="src\test\constructor_test.cpp" />
@@ -252,15 +255,18 @@
     <ClInclude Include="src\functions\imgui_functions.h" />
     <ClInclude Include="src\menus\main_menu.h" />
     <ClInclude Include="src\menus\pch.h" />
+    <ClInclude Include="src\menus\test_menu1.h" />
+    <ClInclude Include="src\menus\test_menu2.h" />
     <ClInclude Include="src\menus\text_menu.h" />
     <ClInclude Include="src\menus\vice_city_menu.h" />
     <ClInclude Include="src\test\constructor_test.h" />
     <ClInclude Include="src\test\curl_test.h" />
-    <ClInclude Include="src\test\defines.h" />
+    <ClInclude Include="src\util\defines.h" />
     <ClInclude Include="src\test\directx9_test.h" />
     <ClInclude Include="src\test\http_lib_test.h" />
     <ClInclude Include="src\test\opengl_test.h" />
     <ClInclude Include="src\util\helpers.h" />
+    <ClInclude Include="src\util\imgui_defines.h" />
     <ClInclude Include="src\util\keystates.h" />
     <ClInclude Include="src\util\text_file_functions.h" />
     <ClInclude Include="src\util\text_functions.h" />
diff --git a/KCNet-ImGui-Test.vcxproj.filters b/KCNet-ImGui-Test.vcxproj.filters
index 91f0d0d..31d5545 100644
--- a/KCNet-ImGui-Test.vcxproj.filters
+++ b/KCNet-ImGui-Test.vcxproj.filters
@@ -67,6 +67,12 @@
     <ClCompile Include="src\functions\imgui_functions.cpp">
       <Filter>src\functions</Filter>
     </ClCompile>
+    <ClCompile Include="src\menus\test_menu2.cpp">
+      <Filter>src\menus</Filter>
+    </ClCompile>
+    <ClCompile Include="src\menus\test_menu1.cpp">
+      <Filter>src\menus</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="lib\ImGui\imconfig.h">
@@ -120,7 +126,7 @@
     <ClInclude Include="src\test\directx9_test.h">
       <Filter>src\test</Filter>
     </ClInclude>
-    <ClInclude Include="src\test\defines.h">
+    <ClInclude Include="src\util\defines.h">
       <Filter>src\test</Filter>
     </ClInclude>
     <ClInclude Include="src\test\curl_test.h">
@@ -144,6 +150,13 @@
     <ClInclude Include="src\functions\imgui_functions.h">
       <Filter>src\functions</Filter>
     </ClInclude>
+    <ClInclude Include="src\util\imgui_defines.h" />
+    <ClInclude Include="src\menus\test_menu2.h">
+      <Filter>src\menus</Filter>
+    </ClInclude>
+    <ClInclude Include="src\menus\test_menu1.h">
+      <Filter>src\menus</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="src">
diff --git a/imgui.ini b/imgui.ini
deleted file mode 100644
index 81911c5..0000000
--- a/imgui.ini
+++ /dev/null
@@ -1,142 +0,0 @@
-[Window][Debug##Default]
-Pos=65,141
-Size=400,400
-Collapsed=1
-
-[Window][Dear ImGui Demo]
-Pos=656,58
-Size=550,681
-
-[Window][Hello, world!]
-Pos=116,183
-Size=339,180
-
-[Window][My new window]
-Pos=10,55
-Size=517,436
-
-[Window][Example: Console]
-Pos=89,56
-Size=520,600
-
-[Window][Example: Documents]
-Pos=55,62
-Size=621,755
-
-[Window][Dear ImGui Debug Log]
-Pos=60,60
-Size=456,156
-
-[Window][Dear ImGui Demo/ResizableChild_D5443E47]
-IsChild=1
-Size=499,136
-
-[Window][Dear ImGui Demo/Red_1D4E05CE]
-IsChild=1
-Size=200,100
-
-[Window][KCNet ImGui]
-Pos=126,147
-Size=487,408
-
-[Window][About Dear ImGui]
-Pos=39,68
-Size=570,126
-
-[Window][Example: Custom rendering]
-Pos=124,129
-Size=531,414
-
-[Window][Example: Log]
-Pos=60,60
-Size=500,400
-
-[Window][Example: Property editor]
-Pos=60,60
-Size=430,450
-
-[Window][Example: Simple layout]
-Pos=60,60
-Size=500,440
-
-[Window][Example: Simple layout/left pane_AED60EF8]
-IsChild=1
-Size=150,386
-
-[Table][0x64418101,3]
-RefScale=13
-Column 0  Width=63
-Column 1  Width=63
-Column 2  Width=63
-
-[Table][0xE0773582,3]
-Column 0  Weight=1.0000
-Column 1  Weight=1.0000
-Column 2  Weight=1.0000
-
-[Table][0xC9935533,3]
-Column 0  Weight=1.0000
-Column 1  Weight=1.0000
-Column 2  Weight=1.0000
-
-[Table][0x47600645,3]
-RefScale=13
-Column 0  Width=63
-Column 1  Width=63
-Column 2  Weight=1.0000
-
-[Table][0xDE6957FF,6]
-RefScale=13
-Column 0  Width=63
-Column 1  Width=63
-Column 2  Width=-1
-Column 3  Weight=1.0000
-Column 4  Weight=1.0000
-Column 5  Weight=-1.0000
-
-[Table][0x861D378E,3]
-Column 0  Weight=1.0000
-Column 1  Weight=1.0000
-Column 2  Weight=1.0000
-
-[Table][0x1F146634,3]
-RefScale=13
-Column 0  Width=63
-Column 1  Width=63
-Column 2  Width=63
-
-[Table][0x8DFA6E86,2]
-Column 0  Weight=1.0000
-Column 1  Weight=1.0000
-
-[Table][0xFABAAEF7,2]
-Column 0  Weight=1.0000
-Column 1  Weight=1.0000
-
-[Table][0xA43C3885,3]
-RefScale=13
-Column 0  Width=56
-Column 1  Width=56
-Column 2  Width=56
-
-[Table][0x49F8DCEA,3]
-RefScale=13
-Column 0  Weight=1.0000
-Column 1  Width=84
-Column 2  Width=126
-
-[Table][0x82CBB907,3]
-Column 0  Weight=1.0000
-Column 1  Weight=1.0000
-Column 2  Weight=1.0000
-
-[Table][0x49D11DC0,3]
-RefScale=13
-Column 0  Width=86
-Column 1  Width=86
-Column 2  Width=86
-
-[Table][0xD181190E,2]
-Column 0  Weight=1.0000
-Column 1  Weight=1.0000
-