diff --git a/.scalafmt.conf b/.scalafmt.conf
index 6ec551a..db31886 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,7 +1 @@
-version = "3.0.0-RC5"
-
-fileOverride {
-  "glob:**/services/{documents,ares}/src/{main,test}/scala/**" {
-    runner.dialect = scala3
-  }
-}
+version = "3.5.8"

diff --git a/.scalafmt.conf b/.scalafmt.conf
index 6ec551a..db31886 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,7 +1 @@
-version = "3.0.0-RC5"
-
-fileOverride {
-  "glob:**/services/{documents,ares}/src/{main,test}/scala/**" {
-    runner.dialect = scala3
-  }
-}
+version = "3.5.8"
diff --git a/src/main/g8/.scalafmt.conf b/src/main/g8/.scalafmt.conf
index 7941f4b..b9e5ecf 100644
--- a/src/main/g8/.scalafmt.conf
+++ b/src/main/g8/.scalafmt.conf
@@ -1,7 +1,3 @@
-version = "3.0.0"
+version = "3.5.8"
 
-// fileOverride {
-//   "glob:**/services/{documents,ares}/src/{main,test}/scala/**" {
-//      runner.dialect = scala3
-//   }
-// }
+runner.dialect = scala3

diff --git a/.scalafmt.conf b/.scalafmt.conf
index 6ec551a..db31886 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,7 +1 @@
-version = "3.0.0-RC5"
-
-fileOverride {
-  "glob:**/services/{documents,ares}/src/{main,test}/scala/**" {
-    runner.dialect = scala3
-  }
-}
+version = "3.5.8"
diff --git a/src/main/g8/.scalafmt.conf b/src/main/g8/.scalafmt.conf
index 7941f4b..b9e5ecf 100644
--- a/src/main/g8/.scalafmt.conf
+++ b/src/main/g8/.scalafmt.conf
@@ -1,7 +1,3 @@
-version = "3.0.0"
+version = "3.5.8"
 
-// fileOverride {
-//   "glob:**/services/{documents,ares}/src/{main,test}/scala/**" {
-//      runner.dialect = scala3
-//   }
-// }
+runner.dialect = scala3
diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties
index dafa845..e160551 100644
--- a/src/main/g8/default.properties
+++ b/src/main/g8/default.properties
@@ -1,4 +1,4 @@
 name = iw-project
-iw_version = 0.3.0-SNAPSHOT
-sbt_version = 1.6.1
-java_version = 11
+iw_version = 0.3.1
+sbt_version = 1.6.2
+java_version = 17

diff --git a/.scalafmt.conf b/.scalafmt.conf
index 6ec551a..db31886 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,7 +1 @@
-version = "3.0.0-RC5"
-
-fileOverride {
-  "glob:**/services/{documents,ares}/src/{main,test}/scala/**" {
-    runner.dialect = scala3
-  }
-}
+version = "3.5.8"
diff --git a/src/main/g8/.scalafmt.conf b/src/main/g8/.scalafmt.conf
index 7941f4b..b9e5ecf 100644
--- a/src/main/g8/.scalafmt.conf
+++ b/src/main/g8/.scalafmt.conf
@@ -1,7 +1,3 @@
-version = "3.0.0"
+version = "3.5.8"
 
-// fileOverride {
-//   "glob:**/services/{documents,ares}/src/{main,test}/scala/**" {
-//      runner.dialect = scala3
-//   }
-// }
+runner.dialect = scala3
diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties
index dafa845..e160551 100644
--- a/src/main/g8/default.properties
+++ b/src/main/g8/default.properties
@@ -1,4 +1,4 @@
 name = iw-project
-iw_version = 0.3.0-SNAPSHOT
-sbt_version = 1.6.1
-java_version = 11
+iw_version = 0.3.1
+sbt_version = 1.6.2
+java_version = 17
diff --git a/src/main/g8/flake.nix b/src/main/g8/flake.nix
index 5cc269c..469660f 100644
--- a/src/main/g8/flake.nix
+++ b/src/main/g8/flake.nix
@@ -13,7 +13,7 @@
           inherit system;
           overlays = [
             (final: prev: rec {
-              jre = prev.adoptopenjdk-hotspot-bin-11;
+              jre = prev.jdk$java_version$_headless;
               jdk = jre;
             })
           ];

diff --git a/.scalafmt.conf b/.scalafmt.conf
index 6ec551a..db31886 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,7 +1 @@
-version = "3.0.0-RC5"
-
-fileOverride {
-  "glob:**/services/{documents,ares}/src/{main,test}/scala/**" {
-    runner.dialect = scala3
-  }
-}
+version = "3.5.8"
diff --git a/src/main/g8/.scalafmt.conf b/src/main/g8/.scalafmt.conf
index 7941f4b..b9e5ecf 100644
--- a/src/main/g8/.scalafmt.conf
+++ b/src/main/g8/.scalafmt.conf
@@ -1,7 +1,3 @@
-version = "3.0.0"
+version = "3.5.8"
 
-// fileOverride {
-//   "glob:**/services/{documents,ares}/src/{main,test}/scala/**" {
-//      runner.dialect = scala3
-//   }
-// }
+runner.dialect = scala3
diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties
index dafa845..e160551 100644
--- a/src/main/g8/default.properties
+++ b/src/main/g8/default.properties
@@ -1,4 +1,4 @@
 name = iw-project
-iw_version = 0.3.0-SNAPSHOT
-sbt_version = 1.6.1
-java_version = 11
+iw_version = 0.3.1
+sbt_version = 1.6.2
+java_version = 17
diff --git a/src/main/g8/flake.nix b/src/main/g8/flake.nix
index 5cc269c..469660f 100644
--- a/src/main/g8/flake.nix
+++ b/src/main/g8/flake.nix
@@ -13,7 +13,7 @@
           inherit system;
           overlays = [
             (final: prev: rec {
-              jre = prev.adoptopenjdk-hotspot-bin-11;
+              jre = prev.jdk$java_version$_headless;
               jdk = jre;
             })
           ];
diff --git a/src/main/g8/shell.nix b/src/main/g8/shell.nix
index bc59c53..a599aac 100644
--- a/src/main/g8/shell.nix
+++ b/src/main/g8/shell.nix
@@ -1,7 +1,7 @@
 { pkgs ? import <nixpkgs> {
   overlays = [
     (final: prev: rec {
-      jre = prev.adoptopenjdk-hotspot-bin-11;
+      jre = prev.jdk$java_version$_headless;
       jdk = jre;
     })
   ];