diff --git a/.gitignore b/.gitignore
index fd00d92..1b71ca1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,39 +1,35 @@
-.gradle
+# Gradle & Kotlin
+.gradle/
 build/
-!gradle/wrapper/gradle-wrapper.jar
-!**/src/main/**/build/
-!**/src/test/**/build/
+.kotlin/
 
-### IntelliJ IDEA ###
-.idea
+# IntelliJ IDEA
+.idea/
 *.iws
 *.iml
 *.ipr
 out/
-!**/src/main/**/out/
-!**/src/test/**/out/
 
-### Eclipse ###
-.apt_generated
+# Eclipse
+.apt_generated/
 .classpath
 .factorypath
 .project
-.settings
+.settings/
 .springBeans
-.sts4-cache
+.sts4-cache/
 bin/
-!**/src/main/**/bin/
-!**/src/test/**/bin/
 
-### NetBeans ###
+# NetBeans
 /nbproject/private/
 /nbbuild/
 /dist/
 /nbdist/
 /.nb-gradle/
 
-### VS Code ###
+# VS Code
 .vscode/
 
-### Mac OS ###
-.DS_Store
\ No newline at end of file
+# OS-spezifisch
+.DS_Store
+Thumbs.db
\ No newline at end of file
diff --git a/block/build.gradle.kts b/block/build.gradle.kts
index 1754a48..320e01d 100644
--- a/block/build.gradle.kts
+++ b/block/build.gradle.kts
@@ -1,14 +1,6 @@
 plugins {
     `java-library`
-}
-
-group = "net.theevilreaper"
-version = "0.0.1"
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(25))
-    }
+    id("bounce.java-conventions")
 }
 
 dependencies {
@@ -22,13 +14,3 @@ dependencies {
     testImplementation(libs.junit.platform.launcher)
     testRuntimeOnly(libs.junit.engine)
 }
-
-tasks {
-    test {
-        jvmArgs("-Dminestom.inside-test=true")
-        useJUnitPlatform()
-        testLogging {
-            events("passed", "skipped", "failed")
-        }
-    }
-}
\ No newline at end of file
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
new file mode 100644
index 0000000..876c922
--- /dev/null
+++ b/buildSrc/build.gradle.kts
@@ -0,0 +1,7 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    mavenCentral()
+}
diff --git a/buildSrc/src/main/kotlin/bounce.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/bounce.java-conventions.gradle.kts
new file mode 100644
index 0000000..a6c4ba5
--- /dev/null
+++ b/buildSrc/src/main/kotlin/bounce.java-conventions.gradle.kts
@@ -0,0 +1,22 @@
+import org.gradle.api.tasks.testing.Test
+
+plugins {
+    java
+}
+
+group = "net.theevilreaper"
+version = "0.0.1"
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(25))
+    }
+}
+
+tasks.withType<Test>().configureEach {
+    jvmArgs("-Dminestom.inside-test=true")
+    useJUnitPlatform()
+    testLogging {
+        events("passed", "skipped", "failed")
+    }
+}
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index 3cdfb43..2681da8 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -1,14 +1,6 @@
 plugins {
     `java-library`
-}
-
-group = "net.theevilreaper"
-version = "0.0.1"
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(25))
-    }
+    id("bounce.java-conventions")
 }
 
 dependencies {
@@ -26,14 +18,3 @@ dependencies {
     testImplementation(libs.junit.platform.launcher)
     testRuntimeOnly(libs.junit.engine)
 }
-
-tasks {
-    test {
-        jvmArgs("-Dminestom.inside-test=true")
-        useJUnitPlatform()
-        testLogging {
-            events("passed", "skipped", "failed")
-        }
-    }
-}
-
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 16c3737..5b8863e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -27,9 +27,9 @@ dependencyResolutionManagement {
             version("shadow", "9.4.2")
             version("aonyx", "0.7.1")
             version("pvp", "2026.05.30-26.1.1")
+            version("cloudnet", "4.0.0-RC17-SNAPSHOT")
 
             library("aonyx.bom", "net.onelitefeather", "aonyx-bom").versionRef("aonyx")
-            version("cloudnet", "4.0.0-RC17-SNAPSHOT")
 
             library("pvp", "io.github.togar2", "MinestomPvP").versionRef("pvp")
             library("minestom", "net.minestom", "minestom").withoutVersion()
diff --git a/setup/build.gradle.kts b/setup/build.gradle.kts
index a23e39d..83d5529 100644
--- a/setup/build.gradle.kts
+++ b/setup/build.gradle.kts
@@ -1,12 +1,10 @@
 plugins {
-    java
     `maven-publish`
     application
     alias(libs.plugins.shadow)
+    id("bounce.java-conventions")
 }
 
-group = "net.theevilreaper"
-version = "0.0.1"
 description = "Bounce Setup Server"
 
 dependencies {
@@ -35,23 +33,8 @@ application {
     mainClass.set("net.theevilreaper.bounce.BounceSetupServer")
 }
 
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(25))
-    }
-}
-
 tasks {
     jar {
         dependsOn("shadowJar")
     }
-
-    test {
-        jvmArgs("-Dminestom.inside-test=true")
-        useJUnitPlatform()
-        testLogging {
-            events("passed", "skipped", "failed")
-        }
-    }
 }
-