diff --git a/.gitattributes b/.gitattributes
index 63a2b0dc3..382bab0ba 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,16 +1,18 @@
-*.jpg binary
-*.png binary
-*.sln binary
-*.vcproj binary
-*.exe binary
-*.lda binary
-*.bin binary
-*.imd binary
-*.rim binary
-*.tap binary
-*.dsk binary
-*.vhd binary
-*.crd binary
-*.dck binary
-sim_rev.h export-subst
-
+*.jpg binary
+*.png binary
+*.sln binary
+*.vcproj binary
+*.exe binary
+*.lda binary
+*.bin binary
+*.imd binary
+*.rim binary
+*.tap binary
+*.dsk binary
+*.vhd binary
+*.crd binary
+*.dck binary
+sim_rev.h export-subst
+*.cmake text=auto
+.gitattributes text=auto
+.gitignore text=auto
diff --git a/.gitignore b/.gitignore
index 95af0ca9a..13671db9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,61 +1,62 @@
-.git-commit-id
-.git-commit-id.h
-#ignore thumbnails created by windows
-Thumbs.db
-#ignore Desktop Services Store created by OSX
-.DS_Store
-#Ignore files built by Visual Studio
-*.obj
-*.exe
-# VAX/vmb.exe is not a generated file and should be in the repository
-!VAX/vmb.exe
-*.pdb
-*.user
-*.aps
-*.pch
-*.vspscc
-*_i.c
-*_p.c
-*.ncb
-*.suo
-*.tlb
-*.tlh
-*.bak
-*.cache
-*.ilk
-*.log
-[Bb]in
-[Dd]ebug*/
-*.lib
-*.sbr
-*.bak
-*.save
-obj/
-[Rr]elease*/
-_ReSharper*/
-[Tt]est[Rr]esult*
-*.o
-*~
-*#
-BIN/
-ipch/
-# Visual Studio, Visual Code directories:
-.vscode/
-.vs/
-build/
-# We only care about specific files in the Visual Studio Projects 
-# folder.  Things which are there on the fly to support debugging 
-# or other things we don't want git to manage.
-Visual Studio Projects/*
-!Visual Studio Projects/*.vcproj
-!Visual Studio Projects/*.vcxproj*
-!Visual Studio Projects/*.sln
-Visual Studio Projects/~AutoRecover.*
-!Visual Studio Projects/0ReadMe_Projects.txt
-**/*.code-workspace
-**/.vscode/
-# Visual Studio artifacts in CMake mode
-out/
-CMakeSettings.json
-## Staging area for cmake install (default install prefix)
-SIMH-install
+CMakeUserPresets.json
+.git-commit-id
+.git-commit-id.h
+#ignore thumbnails created by windows
+Thumbs.db
+#ignore Desktop Services Store created by OSX
+.DS_Store
+#Ignore files built by Visual Studio
+*.obj
+*.exe
+# VAX/vmb.exe is not a generated file and should be in the repository
+!VAX/vmb.exe
+*.pdb
+*.user
+*.aps
+*.pch
+*.vspscc
+*_i.c
+*_p.c
+*.ncb
+*.suo
+*.tlb
+*.tlh
+*.bak
+*.cache
+*.ilk
+*.log
+[Bb]in
+[Dd]ebug*/
+*.lib
+*.sbr
+*.bak
+*.save
+obj/
+[Rr]elease*/
+_ReSharper*/
+[Tt]est[Rr]esult*
+*.o
+*~
+*#
+BIN/
+ipch/
+# Visual Studio, Visual Code directories:
+.vscode/
+.vs/
+build/
+# We only care about specific files in the Visual Studio Projects 
+# folder.  Things which are there on the fly to support debugging 
+# or other things we don't want git to manage.
+Visual Studio Projects/*
+!Visual Studio Projects/*.vcproj
+!Visual Studio Projects/*.vcxproj*
+!Visual Studio Projects/*.sln
+Visual Studio Projects/~AutoRecover.*
+!Visual Studio Projects/0ReadMe_Projects.txt
+**/*.code-workspace
+**/.vscode/
+# Visual Studio artifacts in CMake mode
+out/
+CMakeSettings.json
+## Staging area for cmake install (default install prefix)
+SIMH-install