Fix crash with newer ETF versions

2025-12-15 19:35:10 +01:00 · 2023-01-05 18:26:01 +01:00
107 changed files with 1807 additions and 2323 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +0,0 @@
-# Puzzle v2.2.0
- Setup a **multiversion** build environment
-    - Puzzle will now always be up-to-date on all relevant versions of Minecraft  
-      (Fabric/Forge 1.20.1; Fabric/NeoForge 1.21.1, 1.21.5, 1.21.8, 1.21.10)
- Migrate to Mojang mappings in preparation for upcoming non-obfuscated releases
- Updated Entity Model/Texture Features compatibility
--- a/Puzzle_Splashscreen_Template.zip
+++ b/Puzzle_Splashscreen_Template.zip
--- a/README.md
+++ b/README.md
@@ -1,4 +1,2 @@
 # Puzzle
 Unites optifine replacement mods in a clean &amp; vanilla-style gui
-
-[![Download from Curseforge](https://cf.way2muchnoise.eu/full_563977_downloads%20on%20Curseforge.svg?badge_style=for_the_badge)](https://www.curseforge.com/minecraft/mc-mods/puzzle) [![Download from Modrinth](https://img.shields.io/modrinth/dt/puzzle?color=4&label=Download%20from%20Modrinth&style=for-the-badge)](https://modrinth.com/mod/puzzle) 
--- a/build.gradle
+++ b/build.gradle
@@ -0,0 +1,168 @@
+// Based on https://github.com/OnyxStudios/Cardinal-Components-API/blob/1.17/build.gradle
+plugins {
+    id "fabric-loom" version "0.12-SNAPSHOT" apply false
+    id "com.matthewprenger.cursegradle" version "1.4.0"
+    id "maven-publish"
+    id "java-library"
+}
+
+group = "net.puzzlemc"
+archivesBaseName = "puzzle"
+
+subprojects {
+    apply plugin: 'fabric-loom'
+    apply plugin: 'com.matthewprenger.cursegradle'
+    apply plugin: 'maven-publish'
+    apply plugin: 'java-library'
+
+    archivesBaseName = project.name
+    group = "${rootProject.group}.${rootProject.archivesBaseName}"
+}
+
+allprojects {
+    apply plugin: "fabric-loom"
+    sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
+    version = System.getenv("TRAVIS_TAG") ?: rootProject.mod_version
+
+    configurations {
+        dev
+    }
+
+    repositories {
+        maven { url 'https://jitpack.io' }
+
+    }
+
+    dependencies {
+        minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
+        mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2"
+        modApi "net.fabricmc:fabric-loader:${rootProject.loader_version}"
+        modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_version}"
+    }
+
+    processResources {
+        inputs.property "version", project.version
+
+        filesMatching("fabric.mod.json") {
+            expand "version": project.version
+        }
+    }
+
+    // ensure that the encoding is set to UTF-8, no matter what the system default is
+    // this fixes some edge cases with special characters not displaying correctly
+    // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+    tasks.withType(JavaCompile).configureEach {
+        it.options.encoding = "UTF-8"
+        it.options.release = 17
+    }
+
+    java {
+        // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+        // if it is present.
+        // If you remove this line, sources will not be generated.
+        withSourcesJar()
+    }
+
+    jar {
+    }
+
+     afterEvaluate {
+         artifacts {
+             dev file: file("${project.buildDir}/libs/$archivesBaseName-${version}-dev.jar"), type: "jar", builtBy: sourcesJar
+         }
+     }
+}
+
+subprojects {
+    version = rootProject.version
+}
+
+subprojects.each { remapJar.dependsOn("${it.path}:remapJar") }
+
+repositories {
+    maven {
+        name = "JitPack"
+        url = "https://jitpack.io"
+    }
+    maven {
+        name = "TerraformersMC"
+        url = "https://maven.terraformersmc.com/releases"
+    }
+    maven {
+        name = 'AperLambda'
+        url = 'https://aperlambda.github.io/maven'
+    }
+    mavenCentral()
+    maven {
+        name 'Gegy'
+        url 'https://maven.gegy.dev'
+    }
+    maven {
+        url = "https://api.modrinth.com/maven"
+    }
+    maven {
+        url "https://www.cursemaven.com"
+        content {
+            includeGroup "curse.maven"
+        }
+    }
+    maven {
+        name = 'JitPack'
+        url 'https://jitpack.io'
+    }
+    maven {
+        url "https://maven.shedaniel.me/"
+    }
+}
+
+dependencies {
+    modImplementation ("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
+    modImplementation ("com.terraformersmc:modmenu:${project.mod_menu_version}") {
+        exclude group: "net.fabricmc.fabric-api"
+    }
+    modImplementation ("maven.modrinth:cull-leaves:${project.cull_leaves_version}")
+    modImplementation ("maven.modrinth:lambdynamiclights:${project.ldl_version}")
+    modImplementation ("maven.modrinth:lambdabettergrass:${project.lbg_version}")
+    modImplementation ("maven.modrinth:iris:${project.iris_version}")
+    modCompileOnly ("maven.modrinth:cit-resewn:${project.cit_resewn_version}")
+    modImplementation ("maven.modrinth:continuity:${project.continuity_version}")
+    modImplementation ("maven.modrinth:animatica:${project.animatica_version}")
+    modImplementation ("maven.modrinth:colormatic:${project.colormatic_version}")
+    modImplementation ("maven.modrinth:borderless-mining:${project.borderless_mining_version}")
+    modImplementation ("maven.modrinth:dynamic-fps:${project.dynamic_fps_version}")
+    modImplementation("com.moandjiezana.toml:toml4j:${project.toml4j_version}")
+    modImplementation ("maven.modrinth:entitytexturefeatures:${project.entitytexturefeatures_version}")
+    modImplementation ("maven.modrinth:cem:${project.cem_version}")
+    modImplementation "com.gitlab.Lortseam:completeconfig:${project.complete_config_version}"
+
+    modImplementation("org.aperlambda:lambdajcommon:1.8.1") {
+        exclude group: 'com.google.code.gson'
+        exclude group: 'com.google.guava'
+    }
+    modImplementation "dev.lambdaurora:spruceui:${project.spruceui_version}"
+    modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
+    include "maven.modrinth:midnightlib:${project.midnightlib_version}"
+
+    subprojects.each {
+        api project(path: ":${it.name}", configuration: "dev")
+        include project(":${it.name}")
+    }
+}
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            artifact(file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar")) {
+                builtBy(remapJar)
+            }
+            pom.withXml {
+                subprojects.each {
+                    depNode.appendNode("groupId", it.group)
+                    depNode.appendNode("artifactId", it.name)
+                    depNode.appendNode("version", it.version)
+                    depNode.appendNode("scope", "compile")
+                }
+            }
+        }
+    }
+}
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,292 +0,0 @@
-plugins {
-    id("dev.architectury.loom")
-    id("architectury-plugin")
-    id("me.modmuss50.mod-publish-plugin")
-    id("com.github.johnrengelman.shadow")
-    `maven-publish`
-}
-
-val minecraft = stonecutter.current.version
-val loader = loom.platform.get().name.lowercase()
-
-version = "${mod.version}+$minecraft"
-group = mod.group
-base {
-    archivesName.set("${mod.id}-$loader")
-}
-
-repositories {
-    maven("https://maven.neoforged.net/releases/")
-
-    // ModMenu
-    maven("https://maven.terraformersmc.com/")
-    maven("https://maven.nucleoid.xyz/")
-
-    // MidnightLib
-    maven("https://maven.midnightdust.eu/releases/")
-
-    // Jigsaw modules
-    maven("https://api.modrinth.com/maven")
-    maven("https://maven.terraformersmc.com/releases")
-    maven("https://aperlambda.github.io/maven")
-    mavenCentral()
-    maven("https://maven.gegy.dev")
-
-    maven("https://www.cursemaven.com")
-    maven("https://jitpack.io")
-    maven("https://maven.shedaniel.me/")
-    maven("https://maven.quiltmc.org/repository/release/")
-}
-
-val mappingsAttribute = Attribute.of("net.minecraft.mappings", String::class.java)
-
-dependencies {
-    attributesSchema {
-        attribute(mappingsAttribute)
-    }
-    minecraft("com.mojang:minecraft:$minecraft")
-
-    // Jigsaw modules (GUI compat mods)
-    modCompileOnlyApi ("maven.modrinth:cull-leaves:${mod.jigsaw("cull_leaves_version")}")
-    modCompileOnlyApi ("maven.modrinth:iris:${mod.jigsaw("iris_version")}")
-    modCompileOnly ("maven.modrinth:cit-resewn:${mod.jigsaw("cit_resewn_version")}")
-    modCompileOnlyApi ("maven.modrinth:continuity:${mod.jigsaw("continuity_version")}")
-    modCompileOnlyApi ("maven.modrinth:animatica:${mod.jigsaw("animatica_version")}")
-    modCompileOnlyApi ("maven.modrinth:colormatic:${mod.jigsaw("colormatic_version")}")
-    modCompileOnlyApi ("maven.modrinth:borderless-mining:${mod.jigsaw("borderless_mining_version")}")
-    modCompileOnlyApi ("maven.modrinth:dynamic-fps:${mod.jigsaw("dynamic_fps_version")}")
-    modCompileOnlyApi ("com.moandjiezana.toml:toml4j:${mod.jigsaw("toml4j_version")}")
-    modCompileOnlyApi ("maven.modrinth:entitytexturefeatures:${mod.jigsaw("etf_version")}")
-    modCompileOnlyApi ("maven.modrinth:entity-model-features:${mod.jigsaw("emf_version")}")
-    modCompileOnlyApi ("maven.modrinth:completeconfig:${mod.jigsaw("complete_config_version")}")
-    //modImplementation ("maven.modrinth:exordium:${project.exordium_version}")
-
-    modCompileOnlyApi ("maven.modrinth:lambdabettergrass:${mod.jigsaw("lbg_version")}")
-    modCompileOnlyApi ("dev.lambdaurora:spruceui:${mod.jigsaw("spruceui_version")}")
-
-    // Required for Lambda's mods (DO NOT DEPEND ON OTHERWISE)
-    modCompileOnly ("dev.yumi.mc.core:yumi-mc-foundation:1.0.0-alpha.15+1.21.1")
-    modCompileOnlyApi ("org.aperlambda:lambdajcommon:1.8.1") {
-        exclude(group = "com.google.code.gson")
-        exclude(group = "com.google.guava")
-    }
-
-    // MidnightLib
-    val midnightlib = "eu.midnightdust:midnightlib:${mod.dep("midnightlib_version")}+${minecraft}-${loader}"
-    modImplementation(midnightlib)
-    include(midnightlib)
-
-    if (loader == "fabric") {
-        modImplementation("net.fabricmc:fabric-loader:${mod.dep("fabric_loader")}")
-        modImplementation("com.terraformersmc:modmenu:${mod.dep("modmenu_version")}")
-
-        // Fabric API is required to load modded resources
-        modImplementation("net.fabricmc.fabric-api:fabric-api:${mod.dep("fabric_version")}")
-
-        modCompileOnly ("dev.lambdaurora.lambdynamiclights:lambdynamiclights-api:${mod.jigsaw("ldl_version")}")
-        modCompileOnly ("dev.lambdaurora.lambdynamiclights:lambdynamiclights-runtime:${mod.jigsaw("ldl_version")}")
-    }
-    if (loader == "neoforge") {
-        "neoForge"("net.neoforged:neoforge:${mod.dep("neoforge_loader")}")
-
-        modCompileOnly ("dev.lambdaurora.lambdynamiclights:lambdynamiclights-api:${mod.jigsaw("ldl_version")}") {
-            attributes {
-                attribute(mappingsAttribute, "mojmap")
-            }
-        }
-        modCompileOnly ("dev.lambdaurora.lambdynamiclights:lambdynamiclights-runtime:${mod.jigsaw("ldl_version")}") {
-            attributes {
-                attribute(mappingsAttribute, "mojmap")
-            }
-        }
-    }
-    mappings (loom.officialMojangMappings())
-}
-
-loom {
-    accessWidenerPath = rootProject.file("src/main/resources/puzzle-models.accesswidener")
-
-    decompilers {
-        get("vineflower").apply { // Adds names to lambdas - useful for mixins
-            options.put("mark-corresponding-synthetics", "1")
-        }
-    }
-    if (loader == "forge") {
-        forge.mixinConfigs("puzzle.mixins.json")
-    }
-}
-
-publishMods {
-    val modrinthToken = System.getenv("MODRINTH_TOKEN")
-    val curseforgeToken = System.getenv("CURSEFORGE_TOKEN")
-    val githubToken = System.getenv("GITHUB_TOKEN").orEmpty()
-
-    file = project.tasks.remapJar.get().archiveFile
-    dryRun = modrinthToken == null || curseforgeToken == null
-
-    displayName = "${mod.name} ${mod.version} - ${loader.replaceFirstChar { it.uppercase() }} ${property("mod.mc_title")}"
-    version = "${mod.version}+${property("mod.mc_title")}-${loader}"
-    changelog = rootProject.file("CHANGELOG.md").readText()
-    type = STABLE
-
-    modLoaders.add(loader)
-    if (loader == "fabric") {
-        modLoaders.add("quilt")
-    }
-
-    val targets = property("mod.mc_targets").toString().split(' ')
-    modrinth {
-        projectId = property("publish.modrinth").toString()
-        accessToken = modrinthToken
-        targets.forEach(minecraftVersions::add)
-        requires("midnightlib")
-        if (loader == "fabric") {
-            requires("fabric-api")
-        }
-    }
-
-    curseforge {
-        projectId = property("publish.curseforge").toString()
-        accessToken = curseforgeToken.toString()
-        targets.forEach(minecraftVersions::add)
-        requires("midnightlib")
-        if (loader == "fabric") {
-            requires("fabric-api")
-        }
-    }
-
-//    github {
-//        accessToken = githubToken
-//        repository = "TeamMidnightDust/MidnightLib"
-//        commitish = "multiversion" // This is the branch the release tag will be created from
-//
-//        tagName = "v" + properties["mod.version"]
-//
-//        // Allow the release to be initially created without any files.
-//        allowEmptyFiles = true
-//    }
-}
-publishing {
-    repositories {
-        maven {
-            name = "MidnightDust"
-            url = uri("https://maven.midnightdust.eu/releases")
-            credentials(PasswordCredentials::class)
-        }
-    }
-    publications {
-        create<MavenPublication>("mavenJava") {
-            pom {
-                groupId = "eu.midnightdust"
-                artifactId = project.mod.id
-                version = "${project.version}-${loader}"
-
-                from(components["java"])
-            }
-        }
-    }
-}
-
-java {
-    withSourcesJar()
-    val java = if (stonecutter.eval(minecraft, ">=1.20.5")) JavaVersion.VERSION_21 else JavaVersion.VERSION_17
-    targetCompatibility = java
-    sourceCompatibility = java
-}
-
-val shadowBundle: Configuration by configurations.creating {
-    isCanBeConsumed = false
-    isCanBeResolved = true
-}
-
-tasks.shadowJar {
-    configurations = listOf(shadowBundle)
-    archiveClassifier = "dev-shadow"
-}
-
-tasks.remapJar {
-    injectAccessWidener = true
-    input = tasks.shadowJar.get().archiveFile
-    archiveClassifier = null
-    dependsOn(tasks.shadowJar)
-}
-
-tasks.jar {
-    archiveClassifier = "dev"
-}
-
-val buildAndCollect = tasks.register<Copy>("buildAndCollect") {
-    group = "build"
-    from(tasks.remapJar.get().archiveFile, tasks.remapSourcesJar.get().archiveFile)
-    into(rootProject.layout.buildDirectory.file("libs/${mod.version}/$loader"))
-    dependsOn("build")
-}
-
-if (stonecutter.current.isActive) {
-    rootProject.tasks.register("buildActive") {
-        group = "project"
-        dependsOn(buildAndCollect)
-    }
-
-    rootProject.tasks.register("runActive") {
-        group = "project"
-        dependsOn(tasks.named("runClient"))
-    }
-}
-
-tasks.processResources {
-    properties(
-        listOf("fabric.mod.json"),
-        "id" to mod.id,
-        "name" to mod.name,
-        "version" to mod.version,
-        "minecraft" to mod.prop("mc_dep_fabric")
-    )
-    properties(
-        listOf("META-INF/mods.toml", "pack.mcmeta"),
-        "id" to mod.id,
-        "name" to mod.name,
-        "version" to mod.version,
-        "minecraft" to mod.prop("mc_dep_forgelike")
-    )
-    properties(
-        listOf("META-INF/neoforge.mods.toml", "pack.mcmeta"),
-        "id" to mod.id,
-        "name" to mod.name,
-        "version" to mod.version,
-        "minecraft" to mod.prop("mc_dep_forgelike")
-    )
-}
-
-tasks.build {
-    group = "versioned"
-    description = "Must run through 'chiseledBuild'"
-}
-
-
-stonecutter {
-    constants {
-        arrayOf("fabric", "neoforge").forEach { it -> put(it, loader == it) }
-    }
-
-    replacements.string {
-        direction = eval(current.version, ">=1.21.8")
-        replace("context.renderComponentTooltip(", "context.setComponentTooltipForNextFrame(")
-    }
-    replacements.string {
-        direction = eval(current.version, ">=1.21.5")
-        replace("getTextureImage", "loadContents")
-    }
-    replacements.string {
-        direction = eval(current.version, ">=1.21.5")
-        replace("TextureImage", "TextureContents")
-    }
-    replacements.string {
-        direction = eval(current.version, ">=1.21.5")
-        replace("SimpleTexture", "ReloadableTexture")
-    }
-    replacements.string {
-        direction = eval(current.version, ">=1.21")
-        replace("new ResourceLocation", "ResourceLocation.fromNamespaceAndPath")
-    }
-}
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,8 +0,0 @@
-plugins {
-    `kotlin-dsl`
-    kotlin("jvm") version "2.0.20"
-}
-
-repositories {
-    mavenCentral()
-}
--- a/buildSrc/src/main/kotlin/build-extensions.kt
+++ b/buildSrc/src/main/kotlin/build-extensions.kt
@@ -1,34 +0,0 @@
-import org.gradle.api.Project
-import org.gradle.api.artifacts.dsl.RepositoryHandler
-import org.gradle.kotlin.dsl.expand
-import org.gradle.kotlin.dsl.maven
-import org.gradle.language.jvm.tasks.ProcessResources
-import java.util.*
-
-val Project.mod: ModData get() = ModData(this)
-fun Project.prop(key: String): String? = findProperty(key)?.toString()
-fun String.upperCaseFirst() = replaceFirstChar { if (it.isLowerCase()) it.uppercaseChar() else it }
-
-fun RepositoryHandler.strictMaven(url: String, alias: String, vararg groups: String) = exclusiveContent {
-    forRepository { maven(url) { name = alias } }
-    filter { groups.forEach(::includeGroup) }
-}
-
-fun ProcessResources.properties(files: Iterable<String>, vararg properties: Pair<String, Any>) {
-    for ((name, value) in properties) inputs.property(name, value)
-    filesMatching(files) {
-        expand(properties.toMap())
-    }
-}
-
-@JvmInline
-value class ModData(private val project: Project) {
-    val id: String get() = requireNotNull(project.prop("mod.id")) { "Missing 'mod.id'" }
-    val name: String get() = requireNotNull(project.prop("mod.name")) { "Missing 'mod.name'" }
-    val version: String get() = requireNotNull(project.prop("mod.version")) { "Missing 'mod.version'" }
-    val group: String get() = requireNotNull(project.prop("mod.group")) { "Missing 'mod.group'" }
-
-    fun prop(key: String) = requireNotNull(project.prop("mod.$key")) { "Missing 'mod.$key'" }
-    fun dep(key: String) = requireNotNull(project.prop("deps.$key")) { "Missing 'deps.$key'" }
-    fun jigsaw(key: String) = requireNotNull(project.prop("jigsaws.$key")) { "Missing 'jigsaws.$key'" }
-}
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,56 +1,35 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx3G
-#org.gradle.parallel=true
-org.gradle.caching=false
-org.gradle.caching.debug=false
-org.gradle.parallel=false
-#org.gradle.configureondemand=true
+org.gradle.jvmargs=-Xmx4G

-# Mod properties
-mod.version=2.2.0
-mod.group=eu.midnightdust
-mod.id=puzzle
-mod.name=Puzzle
+# Fabric Properties
+	# check these on https://fabricmc.net/use
+	minecraft_version=1.19
+	yarn_mappings=1.19+build.4
+	loader_version=0.14.8

-# Used for the mod metadata
-mod.mc_dep_fabric=[VERSIONED]
-mod.mc_dep_forgelike=[VERSIONED]
-# Used for the release title. I.e. '1.20.x'
-mod.mc_title=[VERSIONED]
-# Space separated versions for publishing. I.e. '1.20, 1.20.1'
-mod.mc_targets=[VERSIONED]
+# Mod Properties
+	mod_version = 1.4.2-1.19
+	maven_group = net.puzzlemc
+	archives_base_name = puzzle

-# Mod setup
-deps.fabric_loader=0.17.3
-deps.fabric_version=[VERSIONED]
-
-deps.forge_loader=[VERSIONED]
-deps.neoforge_loader=[VERSIONED]
-deps.neoforge_patch=[VERSIONED]
-
-# Mod dependencies
-deps.yarn_build=[VERSIONED]
-deps.modmenu_version=[VERSIONED]
-deps.midnightlib_version=1.9.0
-
-# Mod integrations
-jigsaws.cull_leaves_version = 3.0.2-fabric
-jigsaws.ldl_version = 4.8.6+1.21.10
-jigsaws.lbg_version = 2.5.0+1.21.9
-jigsaws.iris_version = 1.9.6+1.21.10-fabric
-jigsaws.continuity_version = 3.0.0-beta.5+1.21
-jigsaws.animatica_version = 0.6.1+1.21
-jigsaws.colormatic_version = 3.1.2
-jigsaws.borderless_mining_version = 1.1.8+1.20.1
-jigsaws.dynamic_fps_version = 3.6.3
-jigsaws.toml4j_version = 0.7.2
-jigsaws.cit_resewn_version = 1.1.3+1.20
-jigsaws.complete_config_version = 2.3.0
-jigsaws.spruceui_version=5.0.0+1.20
-jigsaws.emf_version=[VERSIONED]
-jigsaws.etf_version=[VERSIONED]
-jigsaws.exordium_version=1.2.1-1.20.2
-
-# Publishing
-publish.modrinth=3IuO68q1
-publish.curseforge=563977
+# Dependencies
+	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
+	fabric_version=0.57.0+1.19
+	mod_menu_version = 4.0.0
+	
+	cull_leaves_version = 2.3.3
+	ldl_version = 2.1.2+1.19
+	lbg_version = 1.3.0+1.19
+	iris_version = 1.19.x-v1.2.5
+	continuity_version = 2.0.0+1.19
+	animatica_version = 0.5+1.19
+	colormatic_version = 3.1.2
+	borderless_mining_version = 1.1.5+1.19
+	dynamic_fps_version = 2.2.0
+	toml4j_version = 0.7.2
+	cit_resewn_version = 1.1.1+1.19
+	cem_version = 0.7.1-1.19
+	complete_config_version = 1.0.0
+	spruceui_version=4.0.0+1.19
+	midnightlib_version=0.5.2
+	entitytexturefeatures_version=4.3.1.fabric.1.19.2
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/puzzle-base/build.gradle
+++ b/puzzle-base/build.gradle
@@ -0,0 +1,9 @@
+archivesBaseName = "puzzle-base"
+repositories {
+    maven {
+        url = "https://api.modrinth.com/maven"
+    }
+}
+dependencies {
+    modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
+}
--- a/puzzle-base/src/main/java/net/puzzlemc/core/PuzzleCore.java
+++ b/puzzle-base/src/main/java/net/puzzlemc/core/PuzzleCore.java
@@ -0,0 +1,23 @@
+package net.puzzlemc.core;
+
+import net.fabricmc.loader.api.FabricLoader;
+import net.puzzlemc.core.config.PuzzleConfig;
+import net.puzzlemc.core.util.UpdateChecker;
+import net.fabricmc.api.ClientModInitializer;
+
+public class PuzzleCore implements ClientModInitializer {
+
+    public final static String version = "Puzzle "+ (FabricLoader.getInstance().getModContainer("puzzle").isPresent() ? FabricLoader.getInstance().getModContainer("puzzle").get().getMetadata().getVersion() : "Test");
+    public final static String name = "Puzzle";
+    public final static String id = "puzzle";
+    public final static String website = "https://github.com/PuzzleMC/Puzzle";
+    public final static String updateURL = "https://modrinth.com/mod/puzzle";
+
+    public final static String UPDATE_CHECKER_URL = "https://raw.githubusercontent.com/PuzzleMC/Puzzle-Versions/main/puzzle_versions.json";
+
+    @Override
+    public void onInitializeClient() {
+        PuzzleConfig.init(id, PuzzleConfig.class);
+        if (PuzzleConfig.checkUpdates) UpdateChecker.init();
+    }
+}
--- a/puzzle-base/src/main/java/net/puzzlemc/core/config/PuzzleConfig.java
+++ b/puzzle-base/src/main/java/net/puzzlemc/core/config/PuzzleConfig.java
@@ -0,0 +1,24 @@
+package net.puzzlemc.core.config;
+
+import eu.midnightdust.lib.config.MidnightConfig;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PuzzleConfig extends MidnightConfig {
+    @Entry public static List<String> disabledIntegrations = new ArrayList<>();
+    @Entry public static boolean enablePuzzleButton = true;
+    @Entry public static boolean debugMessages = false;
+
+    @Entry public static boolean checkUpdates = true;
+    @Entry public static boolean showPuzzleInfo = true;
+    @Entry public static boolean resourcepackSplashScreen = true;
+    @Entry public static boolean unlimitedRotations = true;
+    @Entry public static boolean biggerModels = true;
+
+    @Entry public static int backgroundColor = 15675965;
+    @Entry public static int progressBarColor = 16777215;
+    @Entry public static int progressBarBackgroundColor = 15675965;
+    @Entry public static int progressFrameColor = 16777215;
+    @Entry public static boolean disableBlend = false;
+}
--- a/puzzle-base/src/main/java/net/puzzlemc/core/mixin/MixinDebugHud.java
+++ b/puzzle-base/src/main/java/net/puzzlemc/core/mixin/MixinDebugHud.java
@@ -0,0 +1,38 @@
+package net.puzzlemc.core.mixin;
+
+import com.mojang.blaze3d.platform.GlDebugInfo;
+import net.puzzlemc.core.PuzzleCore;
+import net.puzzlemc.core.config.PuzzleConfig;
+import net.puzzlemc.core.util.UpdateChecker;
+import net.minecraft.client.gui.DrawableHelper;
+import net.minecraft.client.gui.hud.DebugHud;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.List;
+
+@Mixin(DebugHud.class)
+public abstract class MixinDebugHud extends DrawableHelper {
+    @Inject(at = @At("RETURN"), method = "getRightText")
+    private void puzzle$getRightText(CallbackInfoReturnable<List<String>> cir) {
+        if (PuzzleConfig.showPuzzleInfo) {
+            List<String> entries = cir.getReturnValue();
+            String message;
+            if (UpdateChecker.isUpToDate) {
+                message = "Puzzle is up to date (" + PuzzleCore.version + ")";
+            } else {
+                message = "Puzzle is outdated (" + PuzzleCore.version + " -> " + UpdateChecker.latestVersion + ")";
+            }
+            for (int i = 0; i < entries.size(); i++) {
+                String str = entries.get(i);
+
+                if (str.startsWith(GlDebugInfo.getVersion())) {
+                    entries.add(i + 1, message);
+                    break;
+                }
+            }
+        }
+    }
+}
--- a/puzzle-base/src/main/java/net/puzzlemc/core/mixin/MixinTitleScreen.java
+++ b/puzzle-base/src/main/java/net/puzzlemc/core/mixin/MixinTitleScreen.java
@@ -0,0 +1,78 @@
+package net.puzzlemc.core.mixin;
+
+import net.fabricmc.loader.api.FabricLoader;
+import net.puzzlemc.core.PuzzleCore;
+import net.puzzlemc.core.config.PuzzleConfig;
+import net.puzzlemc.core.util.UpdateChecker;
+import net.minecraft.client.gui.screen.*;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.Text;
+import net.minecraft.util.Util;
+import net.minecraft.util.math.MathHelper;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.Objects;
+
+@Mixin(TitleScreen.class)
+public abstract class MixinTitleScreen extends Screen {
+
+    @Shadow @Final private boolean doBackgroundFade;
+    @Shadow private long backgroundFadeStart;
+    private Text puzzleText;
+    private int puzzleTextWidth;
+    private int yOffset;
+
+    protected MixinTitleScreen(Text title) {
+        super(title);
+    }
+    @Inject(at = @At("TAIL"), method = "init")
+    private void puzzle$init(CallbackInfo ci) {
+        yOffset = 20;
+        if (FabricLoader.getInstance().isModLoaded("dashloader")) yOffset = yOffset + 10;
+        if (UpdateChecker.isUpToDate) {
+            puzzleText = Text.of(PuzzleCore.version);
+        }
+        else {
+            puzzleText = Text.translatable("").append(Text.of(PuzzleCore.version + " | ")).append(Text.translatable("puzzle.text.update_available"));
+            this.puzzleTextWidth = this.textRenderer.getWidth(puzzleText);
+        }
+    }
+
+    @Inject(at = @At("TAIL"), method = "render")
+    private void puzzle$render(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+        if (PuzzleConfig.showPuzzleInfo) {
+            float f = this.doBackgroundFade ? (float) (Util.getMeasuringTimeMs() - this.backgroundFadeStart) / 1000.0F : 1.0F;
+            float g = this.doBackgroundFade ? MathHelper.clamp(f - 1.0F, 0.0F, 1.0F) : 1.0F;
+            int l = MathHelper.ceil(g * 255.0F) << 24;
+            textRenderer.drawWithShadow(matrices, puzzleText,2,this.height - yOffset, 16777215 | l);
+            if (mouseX > 2 && mouseX < 2 + this.puzzleTextWidth && mouseY > this.height - yOffset && mouseY < this.height - yOffset + 10) {
+                fill(matrices, 2, this.height - yOffset + 9, 2 + this.puzzleTextWidth, this.height - yOffset + 10, 16777215 | l);
+            }
+        }
+    }
+
+    private void confirmLink(boolean open) {
+        if (open) {
+            Util.getOperatingSystem().open(PuzzleCore.updateURL);
+        }
+        Objects.requireNonNull(this.client).setScreen(this);
+    }
+
+    @Inject(at = @At("HEAD"), method = "mouseClicked",cancellable = true)
+    private void puzzle$mouseClicked(double mouseX, double mouseY, int button, CallbackInfoReturnable<Boolean> cir) {
+        if (mouseX > 2 && mouseX < (double)(2 + this.puzzleTextWidth) && mouseY > (double)(this.height - yOffset) && mouseY < (double)this.height - yOffset + 10) {
+            if (Objects.requireNonNull(this.client).options.getChatLinksPrompt().getValue()) {
+                this.client.setScreen(new ConfirmChatLinkScreen(this::confirmLink, PuzzleCore.updateURL, true));
+            } else {
+                Util.getOperatingSystem().open(PuzzleCore.updateURL);
+            }
+            cir.setReturnValue(false);
+        }
+    }
+}
--- a/puzzle-base/src/main/java/net/puzzlemc/core/util/UpdateChecker.java
+++ b/puzzle-base/src/main/java/net/puzzlemc/core/util/UpdateChecker.java
@@ -0,0 +1,54 @@
+package net.puzzlemc.core.util;
+
+import com.google.common.reflect.TypeToken;
+import com.google.gson.Gson;
+import net.puzzlemc.core.PuzzleCore;
+import net.minecraft.client.MinecraftClient;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.lang.reflect.Type;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+
+
+public class UpdateChecker {
+    private static final Gson GSON = new Gson();
+    private static final String minecraftVersion = MinecraftClient.getInstance().getGame().getVersion().getId();
+    public static final Logger logger = LogManager.getLogger(PuzzleCore.name);
+
+    public static final Type UPDATE_TYPE_TOKEN = new TypeToken<Map<String, String>>(){}.getType();
+    public static String latestVersion;
+    public static boolean isUpToDate = true;
+
+    public static void init() {
+        CompletableFuture.supplyAsync(() -> {
+            try (Reader reader = new InputStreamReader(new URL(PuzzleCore.UPDATE_CHECKER_URL).openStream())) {
+                return GSON.<Map<String, String>>fromJson(reader, UPDATE_TYPE_TOKEN);
+            } catch (MalformedURLException error) {
+                logger.log(Level.ERROR, "Unable to check for updates because of connection problems: " + error.getMessage());
+            } catch (IOException error) {
+                logger.log(Level.ERROR, "Unable to check for updates because of an I/O Exception: " + error.getMessage());
+            }
+
+            return null;
+        }).thenAcceptAsync(versionMap -> {
+            if (versionMap != null && versionMap.containsKey(minecraftVersion)) {
+                latestVersion = versionMap.get(minecraftVersion);
+                if (!latestVersion.equals(PuzzleCore.version)) {
+                    isUpToDate = false;
+                    logger.log(Level.INFO, "There is a newer version of "+ PuzzleCore.name +" available: " + latestVersion);
+                    logger.log(Level.INFO, "Please update immediately!");
+                }
+            } else {
+                logger.log(Level.WARN, "A problem with the database occurred, could not check for updates.");
+            }
+        }, MinecraftClient.getInstance());
+    }
+}
--- a/puzzle-base/src/main/resources/assets/puzzle/icon.png
+++ b/puzzle-base/src/main/resources/assets/puzzle/icon.png
--- a/puzzle-base/src/main/resources/fabric.mod.json
+++ b/puzzle-base/src/main/resources/fabric.mod.json
@@ -0,0 +1,40 @@
+{
+  "schemaVersion": 1,
+  "id": "puzzle-base",
+  "version": "${version}",
+
+  "name": "Puzzle Base",
+  "description": "Shared code between all Puzzle modules",
+  "authors": [
+    "PuzzleMC",
+    "Motschen"
+  ],
+  "contact": {
+    "homepage": "https://www.midnightdust.eu/",
+    "sources": "https://github.com/TeamMidnightDust/Puzzle",
+    "issues": "https://github.com/TeamMidnightDust/Puzzle/issues"
+  },
+
+  "license": "MIT",
+  "icon": "assets/puzzle/icon.png",
+
+  "environment": "client",
+  "entrypoints": {
+    "client": [
+      "net.puzzlemc.core.PuzzleCore"
+    ]
+  },
+  "custom": {
+    "modmenu": {
+      "parent": "puzzle"
+    }
+  },
+
+  "mixins": [
+    "puzzle-base.mixins.json"
+  ],
+
+  "depends": {
+    "fabric": "*"
+  }
+}
--- a/src/main/resources/puzzle-splashscreen_neoforge.mixins.json
+++ b/src/main/resources/puzzle-splashscreen_neoforge.mixins.json
@@ -1,9 +1,10 @@
 {
  "required": true,
-  "package": "net.puzzlemc.splashscreen.mixin",
+  "package": "net.puzzlemc.core.mixin",
  "compatibilityLevel": "JAVA_17",
  "client": [
-    "MixinNeoForgeLoadingOverlay"
+    "MixinTitleScreen",
+    "MixinDebugHud"
  ],
  "injectors": {
    "defaultRequire": 1
--- a/puzzle-gui/build.gradle
+++ b/puzzle-gui/build.gradle
@@ -0,0 +1,59 @@
+archivesBaseName = "puzzle-gui"
+
+repositories {
+	maven { url "https://maven.terraformersmc.com/releases" }
+	maven {
+		name = 'AperLambda'
+		url = 'https://aperlambda.github.io/maven'
+	}
+	mavenCentral()
+	maven {
+		name 'Gegy'
+		url 'https://maven.gegy.dev'
+	}
+	maven {
+		url = "https://api.modrinth.com/maven"
+	}
+	maven {
+		url "https://www.cursemaven.com"
+		content {
+			includeGroup "curse.maven"
+		}
+	}
+	maven {
+		name = 'JitPack'
+		url 'https://jitpack.io'
+	}
+	maven {
+		url "https://maven.shedaniel.me/"
+	}
+}
+
+dependencies {
+	api project(":puzzle-base")
+	api project(":puzzle-splashscreen")
+
+	modImplementation "dev.lambdaurora:spruceui:${project.spruceui_version}"
+	modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
+
+	modImplementation ("com.terraformersmc:modmenu:${project.mod_menu_version}")
+	modImplementation ("maven.modrinth:cull-leaves:${project.cull_leaves_version}")
+	modImplementation ("maven.modrinth:lambdynamiclights:${project.ldl_version}")
+	modImplementation ("maven.modrinth:lambdabettergrass:${project.lbg_version}")
+ 	modImplementation ("maven.modrinth:iris:${project.iris_version}")
+	modImplementation ("maven.modrinth:cit-resewn:${project.cit_resewn_version}")
+	modImplementation ("maven.modrinth:colormatic:${project.colormatic_version}")
+	modImplementation ("maven.modrinth:borderless-mining:${project.borderless_mining_version}")
+	modImplementation ("maven.modrinth:dynamic-fps:${project.dynamic_fps_version}")
+	modImplementation ("maven.modrinth:entitytexturefeatures:${project.entitytexturefeatures_version}")
+	modImplementation ("maven.modrinth:cem:${project.cem_version}")
+	modImplementation "com.gitlab.Lortseam:completeconfig:${project.complete_config_version}"
+
+	modImplementation("org.aperlambda:lambdajcommon:1.8.1") {
+		exclude group: 'com.google.code.gson'
+		exclude group: 'com.google.guava'
+	}
+ 	modImplementation ("maven.modrinth:continuity:${project.continuity_version}") {
+         exclude module: "modmenu"
+ 	}
+} 
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/IrisCompat.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/IrisCompat.java
@@ -0,0 +1,27 @@
+package net.puzzlemc.gui;
+
+import eu.midnightdust.lib.util.MidnightColorUtil;
+import net.fabricmc.loader.api.FabricLoader;
+import net.irisshaders.iris.api.v0.IrisApi;
+import net.irisshaders.iris.api.v0.IrisApiConfig;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.text.Style;
+import net.minecraft.text.Text;
+import net.puzzlemc.gui.screen.widget.PuzzleWidget;
+
+public class IrisCompat {
+    public static void init() {
+        if (FabricLoader.getInstance().isModLoaded("iris")) {
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("Iris")));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("iris.puzzle.option.enableShaders"), (button) -> button.setMessage(IrisApi.getInstance().getConfig().areShadersEnabled() ? PuzzleClient.YES : PuzzleClient.NO), (button) -> {
+                IrisApiConfig irisConfig = IrisApi.getInstance().getConfig();
+                irisConfig.setShadersEnabledAndApply(!irisConfig.areShadersEnabled());
+            }));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("options.iris.shaderPackSelection.title"), (button) -> button.setMessage(Text.literal("➥ ").append(Text.translatable("iris.puzzle.option.open").setStyle(Style.EMPTY.withColor(MidnightColorUtil.radialRainbow(0.5f, 1).getRGB())))), (button) -> {
+                MinecraftClient client = MinecraftClient.getInstance();
+                client.setScreen((Screen) IrisApi.getInstance().openMainIrisScreenObj(client.currentScreen));
+            }));
+        }
+    }
+}
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleApi.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleApi.java
@@ -2,13 +2,15 @@ package net.puzzlemc.gui;

 import net.puzzlemc.core.config.PuzzleConfig;
 import net.puzzlemc.gui.screen.widget.PuzzleWidget;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;

 import java.util.ArrayList;
 import java.util.List;

-import static net.puzzlemc.core.PuzzleCore.LOGGER;
-
 public class PuzzleApi {
+    private static Logger LOGGER = LogManager.getLogger("puzzle-gui");
+
    public static List<PuzzleWidget> GRAPHICS_OPTIONS = new ArrayList<>();
    public static List<PuzzleWidget> MISC_OPTIONS = new ArrayList<>();
    public static List<PuzzleWidget> PERFORMANCE_OPTIONS = new ArrayList<>();
@@ -16,22 +18,18 @@ public class PuzzleApi {

    public static void addToGraphicsOptions(PuzzleWidget button) {
        GRAPHICS_OPTIONS.add(button);
-        if (PuzzleConfig.debugMessages)
-            LOGGER.info("{} -> Graphics Options", button.descriptionText.getContents().toString());
+        if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.getContent().toString() + " -> Graphics Options");
    }
    public static void addToMiscOptions(PuzzleWidget button) {
        MISC_OPTIONS.add(button);
-        if (PuzzleConfig.debugMessages)
-            LOGGER.info("{} -> Misc Options", button.descriptionText.getContents().toString());
+        if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.getContent().toString() + " -> Misc Options");
    }
    public static void addToPerformanceOptions(PuzzleWidget button) {
        PERFORMANCE_OPTIONS.add(button);
-        if (PuzzleConfig.debugMessages)
-            LOGGER.info("{}- > Performance Options", button.descriptionText.getContents().toString());
+        if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.getContent().toString() + "- > Performance Options");
    }
    public static void addToResourceOptions(PuzzleWidget button) {
        RESOURCE_OPTIONS.add(button);
-        if (PuzzleConfig.debugMessages)
-            LOGGER.info("{} -> Resource Options", button.descriptionText.getContents().toString());
+        if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.getContent().toString() + " -> Resource Options");
    }
 }
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleClient.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleClient.java
@@ -0,0 +1,309 @@
+package net.puzzlemc.gui;
+
+import dev.lambdaurora.lambdabettergrass.LBGConfig;
+import dev.lambdaurora.lambdabettergrass.LambdaBetterGrass;
+import dev.lambdaurora.lambdynlights.DynamicLightsConfig;
+import dev.lambdaurora.lambdynlights.LambDynLights;
+import dynamicfps.DynamicFPSConfig;
+import dynamicfps.DynamicFPSMod;
+import eu.midnightdust.core.MidnightLibClient;
+import eu.midnightdust.cullleaves.config.CullLeavesConfig;
+import io.github.kvverti.colormatic.Colormatic;
+import io.github.kvverti.colormatic.ColormaticConfigController;
+import link.infra.borderlessmining.config.ConfigHandler;
+import me.pepperbell.continuity.client.config.ContinuityConfig;
+import me.pepperbell.continuity.client.config.Option;
+import net.dorianpb.cem.internal.config.CemConfig;
+import net.dorianpb.cem.internal.config.CemConfigFairy;
+import net.dorianpb.cem.internal.config.CemOptions;
+import net.puzzlemc.core.config.PuzzleConfig;
+import net.puzzlemc.gui.mixin.CemConfigAccessor;
+import net.puzzlemc.gui.screen.widget.PuzzleWidget;
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+import net.puzzlemc.splashscreen.PuzzleSplashScreen;
+import shcm.shsupercm.fabric.citresewn.config.CITResewnConfig;
+import traben.entity_texture_features.ETFApi;
+import traben.entity_texture_features.config.ETFConfig;
+import io.github.kvverti.colormatic.ColormaticConfig;
+
+public class PuzzleClient implements ClientModInitializer {
+
+    public final static String id = "puzzle";
+    public static final Text YES = Text.translatable("gui.yes").formatted(Formatting.GREEN);
+    public static final Text NO = Text.translatable("gui.no").formatted(Formatting.RED);
+
+    @Override
+    public void onInitializeClient() {
+        MidnightLibClient.hiddenMods.add("puzzle");
+        MinecraftClient client = MinecraftClient.getInstance();
+        PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("Puzzle")));
+        PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("puzzle.option.check_for_updates"), (button) -> button.setMessage(PuzzleConfig.checkUpdates ? YES : NO), (button) -> {
+            PuzzleConfig.checkUpdates = !PuzzleConfig.checkUpdates;
+            PuzzleConfig.write(id);
+        }));
+        PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("puzzle.option.show_version_info"), (button) -> button.setMessage(PuzzleConfig.showPuzzleInfo ? YES : NO), (button) -> {
+            PuzzleConfig.showPuzzleInfo = !PuzzleConfig.showPuzzleInfo;
+            PuzzleConfig.write(id);
+        }));
+        PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("puzzle.midnightconfig.title"), (button) -> button.setMessage(Text.of("OPEN")), (button) -> {
+            client.setScreen(PuzzleConfig.getScreen(client.currentScreen, "puzzle"));
+        }));
+        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Puzzle")));
+        if (FabricLoader.getInstance().isModLoaded("puzzle-splashscreen") && !PuzzleConfig.disabledIntegrations.contains("puzzle-splashscreen")) {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("puzzle.option.resourcepack_splash_screen"), (button) -> button.setMessage(PuzzleConfig.resourcepackSplashScreen ? YES : NO), (button) -> {
+                PuzzleConfig.resourcepackSplashScreen = !PuzzleConfig.resourcepackSplashScreen;
+                PuzzleConfig.write(id);
+                PuzzleSplashScreen.resetColors();
+                MinecraftClient.getInstance().getTextureManager().registerTexture(PuzzleSplashScreen.LOGO, new PuzzleSplashScreen.LogoTexture(PuzzleSplashScreen.LOGO));
+            }));
+        }
+        if (FabricLoader.getInstance().isModLoaded("puzzle-models") && !PuzzleConfig.disabledIntegrations.contains("puzzle-models")) {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("puzzle.option.unlimited_model_rotations"), (button) -> button.setMessage(PuzzleConfig.unlimitedRotations ? YES : NO), (button) -> {
+                PuzzleConfig.unlimitedRotations = !PuzzleConfig.unlimitedRotations;
+                PuzzleConfig.write(id);
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("puzzle.option.bigger_custom_models"), (button) -> button.setMessage(PuzzleConfig.biggerModels ? YES : NO), (button) -> {
+                PuzzleConfig.biggerModels = !PuzzleConfig.biggerModels;
+                PuzzleConfig.write(id);
+            }));
+        }
+        if (FabricLoader.getInstance().isModLoaded("cullleaves") && !PuzzleConfig.disabledIntegrations.contains("cullleaves")) {
+            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("CullLeaves")));
+            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("cullleaves.puzzle.option.enabled"), (button) -> button.setMessage(CullLeavesConfig.enabled ? YES : NO), (button) -> {
+                CullLeavesConfig.enabled = !CullLeavesConfig.enabled;
+                CullLeavesConfig.write("cullleaves");
+                MinecraftClient.getInstance().worldRenderer.reload();
+            }));
+        }
+        if (FabricLoader.getInstance().isModLoaded("colormatic") && !PuzzleConfig.disabledIntegrations.contains("colormatic")) {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Colormatic")));
+            ColormaticConfig colormaticConfig = Colormatic.config();
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("colormatic.config.option.clearSky"), (button) -> button.setMessage(colormaticConfig.clearSky ? YES : NO), (button) -> {
+                colormaticConfig.clearSky = !colormaticConfig.clearSky;
+                ColormaticConfigController.persist(colormaticConfig);
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("colormatic.config.option.clearVoid"), (button) -> button.setMessage(colormaticConfig.clearVoid ? YES : NO), (button) -> {
+                colormaticConfig.clearVoid = !colormaticConfig.clearVoid;
+                ColormaticConfigController.persist(colormaticConfig);
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("colormatic.config.option.blendSkyLight"), (button) -> button.setMessage(colormaticConfig.blendSkyLight ? YES : NO), (button) -> {
+                colormaticConfig.blendSkyLight = !colormaticConfig.blendSkyLight;
+                ColormaticConfigController.persist(colormaticConfig);
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("colormatic.config.option.flickerBlockLight"), (button) -> button.setMessage(colormaticConfig.flickerBlockLight ? YES : NO), (button) -> {
+                colormaticConfig.flickerBlockLight = !colormaticConfig.flickerBlockLight;
+                ColormaticConfigController.persist(colormaticConfig);
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(0, 100, Text.translatable("colormatic.config.option.relativeBlockLightIntensity"),
+                    () -> (int) (100*(1.0 - colormaticConfig.relativeBlockLightIntensityExponent / -16.0)),
+                    (button) -> button.setMessage(Text.translatable("colormatic.config.option.relativeBlockLightIntensity")
+                        .append(": ")
+                        .append(Text.literal(String.valueOf((int)(100 * Math.exp(ColormaticConfig.scaled(colormaticConfig.relativeBlockLightIntensityExponent))))).append("%"))),
+                        (slider) -> {
+                            try {
+                                colormaticConfig.relativeBlockLightIntensityExponent = ((1.00 - ((slider.getInt())/100f)) * -16.0);
+                                ColormaticConfigController.persist(colormaticConfig);
+                            }
+                            catch (NumberFormatException ignored) {}
+            }));
+        }
+        if (FabricLoader.getInstance().isModLoaded("dynamicfps") && !PuzzleConfig.disabledIntegrations.contains("dynamicfps")) {
+            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("Dynamic FPS")));
+            DynamicFPSConfig fpsConfig = DynamicFPSMod.config;
+            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("config.dynamicfps.reduce_when_unfocused"), (button) -> button.setMessage(fpsConfig.reduceFPSWhenUnfocused ? YES : NO), (button) -> {
+                fpsConfig.reduceFPSWhenUnfocused = !fpsConfig.reduceFPSWhenUnfocused;
+                fpsConfig.save();
+            }));
+            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(0, 60,Text.translatable("config.dynamicfps.unfocused_fps"), () -> fpsConfig.unfocusedFPS,
+                    (button) -> button.setMessage(Text.of(fpsConfig.unfocusedFPS + " FPS")),
+                    (slider) -> {
+                        try {
+                            fpsConfig.unfocusedFPS = slider.getInt();
+                        }
+                        catch (NumberFormatException ignored) {}
+                        finally {fpsConfig.save();}
+                    }));
+            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("config.dynamicfps.restore_when_hovered"), (button) -> button.setMessage(fpsConfig.restoreFPSWhenHovered ? YES : NO), (button) -> {
+                fpsConfig.restoreFPSWhenHovered = !fpsConfig.restoreFPSWhenHovered;
+                fpsConfig.save();
+            }));
+            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("config.dynamicfps.run_gc_on_unfocus"), (button) -> button.setMessage(fpsConfig.runGCOnUnfocus ? YES : NO), (button) -> {
+                fpsConfig.runGCOnUnfocus = !fpsConfig.runGCOnUnfocus;
+                fpsConfig.save();
+            }));
+            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(0, 100,Text.translatable("config.dynamicfps.unfocused_volume"), () -> ((Number)(fpsConfig.unfocusedVolumeMultiplier * 100)).intValue(),
+                    (button) -> button.setMessage(Text.of(((Number)(fpsConfig.unfocusedVolumeMultiplier * 100)).intValue() + "%")),
+                    (slider) -> {
+                        try {
+                            fpsConfig.unfocusedVolumeMultiplier = ((Number)slider.getInt()).floatValue() / 100;
+                        }
+                        catch (NumberFormatException ignored) {}
+                        finally {fpsConfig.save();}
+                    }));
+            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(0, 100,Text.translatable("config.dynamicfps.hidden_volume"), () -> ((Number)(fpsConfig.hiddenVolumeMultiplier * 100)).intValue(),
+                    (button) -> button.setMessage(Text.of(((Number)(fpsConfig.hiddenVolumeMultiplier * 100)).intValue() + "%")),
+                    (slider) -> {
+                        try {
+                            fpsConfig.hiddenVolumeMultiplier = ((Number)slider.getInt()).floatValue() / 100;
+                        }
+                        catch (NumberFormatException ignored) {}
+                        finally {fpsConfig.save();}
+                    }));
+        }
+        if (FabricLoader.getInstance().isModLoaded("borderlessmining") && !PuzzleConfig.disabledIntegrations.contains("borderlessmining")) {
+            PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("Borderless Mining")));
+            ConfigHandler bmConfig = ConfigHandler.getInstance();
+            PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("config.borderlessmining.general.enabled"), (button) -> button.setMessage(bmConfig.isEnabledOrPending() ? YES : NO), (button) -> {
+                bmConfig.setEnabledPending(!bmConfig.isEnabledOrPending());
+                bmConfig.save();
+            }));
+            if (MinecraftClient.IS_SYSTEM_MAC) {
+                PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("config.borderlessmining.general.enabledmac"), (button) -> button.setMessage(bmConfig.enableMacOS ? YES : NO), (button) -> {
+                    bmConfig.enableMacOS = !bmConfig.enableMacOS;
+                    bmConfig.setEnabledPending(bmConfig.isEnabled());
+                    bmConfig.save();
+                }));
+            }
+        }
+        if (FabricLoader.getInstance().isModLoaded("iris") && !PuzzleConfig.disabledIntegrations.contains("iris")) {
+            IrisCompat.init();
+        }
+    }
+    public static boolean lateInitDone = false;
+    public static void lateInit() { // Some mods are initialized after Puzzle, so we can't access them in our ClientModInitializer
+        if (FabricLoader.getInstance().isModLoaded("lambdynlights") && !PuzzleConfig.disabledIntegrations.contains("lambdynlights")) {
+            DynamicLightsConfig ldlConfig = LambDynLights.get().config;
+
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("LambDynamicLights")));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("lambdynlights.option.mode"), (button) -> button.setMessage(ldlConfig.getDynamicLightsMode().getTranslatedText()), (button) -> ldlConfig.setDynamicLightsMode(ldlConfig.getDynamicLightsMode().next())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("").append("DynLights: ").append(Text.translatable("lambdynlights.option.light_sources.entities")), (button) -> button.setMessage(ldlConfig.getEntitiesLightSource().get() ? YES : NO), (button) -> ldlConfig.getEntitiesLightSource().set(!ldlConfig.getEntitiesLightSource().get())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("").append("DynLights: ").append(Text.translatable("lambdynlights.option.light_sources.block_entities")), (button) -> button.setMessage(ldlConfig.getBlockEntitiesLightSource().get() ? YES : NO), (button) -> ldlConfig.getBlockEntitiesLightSource().set(!ldlConfig.getBlockEntitiesLightSource().get())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("").append("DynLights: ").append(Text.translatable("entity.minecraft.creeper")), (button) -> button.setMessage(ldlConfig.getCreeperLightingMode().getTranslatedText()), (button) -> ldlConfig.setCreeperLightingMode(ldlConfig.getCreeperLightingMode().next())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("").append("DynLights: ").append(Text.translatable("block.minecraft.tnt")), (button) -> button.setMessage(ldlConfig.getTntLightingMode().getTranslatedText()), (button) -> ldlConfig.setTntLightingMode(ldlConfig.getTntLightingMode().next())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("").append("DynLights: ").append(Text.translatable("lambdynlights.option.light_sources.water_sensitive_check")), (button) -> button.setMessage(ldlConfig.getWaterSensitiveCheck().get() ? YES : NO), (button) -> ldlConfig.getWaterSensitiveCheck().set(!ldlConfig.getWaterSensitiveCheck().get())));
+        }
+        if (FabricLoader.getInstance().isModLoaded("citresewn") && !PuzzleConfig.disabledIntegrations.contains("citresewn") && CITResewnConfig.INSTANCE != null) {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("CIT Resewn")));
+            CITResewnConfig citConfig = CITResewnConfig.INSTANCE;
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.citresewn.enabled.title"), (button) -> button.setMessage(citConfig.enabled ? YES : NO), (button) -> {
+                citConfig.enabled = !citConfig.enabled;
+                citConfig.write();
+                MinecraftClient.getInstance().reloadResources();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.citresewn.mute_errors.title"), (button) -> button.setMessage(citConfig.mute_errors ? YES : NO), (button) -> {
+                citConfig.mute_errors = !citConfig.mute_errors;
+                citConfig.write();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.citresewn.mute_warns.title"), (button) -> button.setMessage(citConfig.mute_warns ? YES : NO), (button) -> {
+                citConfig.mute_warns = !citConfig.mute_warns;
+                citConfig.write();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.citresewn.broken_paths.title"), (button) -> button.setMessage(citConfig.broken_paths ? YES : NO), (button) -> {
+                citConfig.broken_paths = !citConfig.broken_paths;
+                citConfig.write();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(0, 100,Text.translatable("config.citresewn.cache_ms.title"), () -> citConfig.cache_ms,
+                    (button) -> button.setMessage(message(citConfig)),
+                    (slider) -> {
+                try {
+                    citConfig.cache_ms = slider.getInt();
+                }
+                catch (NumberFormatException ignored) {}
+                citConfig.write();
+            }));
+        }
+        if (FabricLoader.getInstance().isModLoaded("lambdabettergrass") && !PuzzleConfig.disabledIntegrations.contains("lambdabettergrass")) {
+            LBGConfig lbgConfig = LambdaBetterGrass.get().config;
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("LambdaBetterGrass")));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("lambdabettergrass.option.mode"), (button) -> button.setMessage(lbgConfig.getMode().getTranslatedText()), (button) -> lbgConfig.setMode(lbgConfig.getMode().next())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("lambdabettergrass.option.better_snow"), (button) -> button.setMessage(lbgConfig.hasBetterLayer() ? YES : NO), (button) -> lbgConfig.setBetterLayer(!lbgConfig.hasBetterLayer())));
+        }
+        if (FabricLoader.getInstance().isModLoaded("cem") && FabricLoader.getInstance().isModLoaded("completeconfig") && !PuzzleConfig.disabledIntegrations.contains("cem")) {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Custom Entity Models")));
+            CemConfig cemConfig = (CemConfig) CemConfigFairy.getConfig();
+            CemOptions cemOptions = CemConfigFairy.getConfig();
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.cem.use_optifine_folder"), (button) -> button.setMessage(cemConfig.useOptifineFolder() ? YES : NO), (button) -> {
+                ((CemConfigAccessor)cemOptions).setUseOptifineFolder(!cemConfig.useOptifineFolder());
+                cemConfig.save();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.cem.use_new_model_creation_fix"), (button) -> button.setMessage(cemConfig.useTransparentParts() ? YES : NO), (button) -> {
+                ((CemConfigAccessor)cemOptions).setUseModelCreationFix(!cemConfig.useTransparentParts());
+                cemConfig.save();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.cem.use_old_animations"), (button) -> button.setMessage(cemConfig.useOldAnimations() ? YES : NO), (button) -> {
+                ((CemConfigAccessor)cemOptions).setUseOldAnimations(!cemConfig.useOldAnimations());
+                cemConfig.save();
+            }));
+        }
+        if (FabricLoader.getInstance().isModLoaded("continuity") && !PuzzleConfig.disabledIntegrations.contains("continuity")) {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Continuity")));
+            ContinuityConfig contConfig = ContinuityConfig.INSTANCE;
+            contConfig.getOptionMapView().forEach((s, option) -> {
+                if (s.equals("use_manual_culling")) return;
+                try {
+                    Option.BooleanOption booleanOption = ((Option.BooleanOption)option);
+                    PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("options.continuity."+s), (button) -> button.setMessage(booleanOption.get() ? YES : NO), (button) -> {
+                        booleanOption.set(!booleanOption.get());
+                        contConfig.onChange();
+                        contConfig.save();
+                    }));
+                } catch (Exception ignored) {}
+            });
+        }
+        if (FabricLoader.getInstance().isModLoaded("entity_texture_features") && !PuzzleConfig.disabledIntegrations.contains("entity_texture_features")) {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.title")));
+            ETFConfig etfConfig = ETFApi.getETFConfigObject;
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.enable_custom_textures.title"), (button) -> button.setMessage(etfConfig.enableCustomTextures ? YES : NO), (button) -> {
+                etfConfig.enableCustomTextures = !etfConfig.enableCustomTextures;
+                ETFApi.saveETFConfigChangesAndResetETF();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.enable_emissive_textures.title"), (button) -> button.setMessage(etfConfig.enableEmissiveTextures ? YES : NO), (button) -> {
+                etfConfig.enableEmissiveTextures = !etfConfig.enableEmissiveTextures;
+                ETFApi.saveETFConfigChangesAndResetETF();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.emissive_mode.title"), (button) -> button.setMessage(
+                    Text.literal(etfConfig.emissiveRenderMode.toString())), (button) -> {
+                etfConfig.emissiveRenderMode = etfConfig.emissiveRenderMode.next();
+                ETFApi.saveETFConfigChangesAndResetETF();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.blinking_mob_settings.title"), (button) -> button.setMessage(etfConfig.enableBlinking ? YES : NO), (button) -> {
+                etfConfig.enableBlinking = !etfConfig.enableBlinking;
+                ETFApi.saveETFConfigChangesAndResetETF();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.player_skin_features.title"), (button) -> button.setMessage(etfConfig.skinFeaturesEnabled ? YES : NO), (button) -> {
+                etfConfig.skinFeaturesEnabled = !etfConfig.skinFeaturesEnabled;
+                ETFApi.saveETFConfigChangesAndResetETF();
+            }));
+        }
+        lateInitDone = true;
+    }
+    public static Text message(CITResewnConfig config) {
+        int ticks = config.cache_ms;
+            if (ticks <= 1) {
+                return (Text.translatable("config.citresewn.cache_ms.ticks." + ticks)).formatted(Formatting.AQUA);
+            } else {
+                Formatting color = Formatting.DARK_RED;
+                if (ticks <= 40) {
+                    color = Formatting.RED;
+                }
+
+                if (ticks <= 20) {
+                    color = Formatting.GOLD;
+                }
+
+                if (ticks <= 10) {
+                    color = Formatting.DARK_GREEN;
+                }
+
+                if (ticks <= 5) {
+                    color = Formatting.GREEN;
+                }
+
+                return (Text.translatable("config.citresewn.cache_ms.ticks.any", ticks)).formatted(color);
+            }
+    }
+}
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/config/ModMenuIntegration.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/config/ModMenuIntegration.java
@@ -0,0 +1,31 @@
+package net.puzzlemc.gui.config;
+
+import com.terraformersmc.modmenu.api.ConfigScreenFactory;
+import com.terraformersmc.modmenu.api.ModMenuApi;
+import net.puzzlemc.gui.screen.PuzzleOptionsScreen;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Environment(EnvType.CLIENT)
+public class ModMenuIntegration implements ModMenuApi {
+    @Override
+    public ConfigScreenFactory<?> getModConfigScreenFactory() {
+        return PuzzleOptionsScreen::new;
+    }
+
+    //Used to set the config screen for all modules //
+    @Override
+    public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
+        Map<String, ConfigScreenFactory<?>> map = new HashMap<>();
+        map.put("puzzle-gui",PuzzleOptionsScreen::new);
+        map.put("puzzle-blocks",PuzzleOptionsScreen::new);
+        map.put("puzzle-base",PuzzleOptionsScreen::new);
+        map.put("puzzle-models",PuzzleOptionsScreen::new);
+        map.put("puzzle-splashscreen",PuzzleOptionsScreen::new);
+        map.put("puzzle",PuzzleOptionsScreen::new);
+        return map;
+    }
+}
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/mixin/CemConfigAccessor.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/mixin/CemConfigAccessor.java
@@ -0,0 +1,17 @@
+package net.puzzlemc.gui.mixin;
+
+import net.dorianpb.cem.internal.config.CemConfig;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(value = CemConfig.class, remap = false)
+public interface CemConfigAccessor {
+    @Accessor("use_optifine_folder")
+    void setUseOptifineFolder(boolean value);
+
+    @Accessor("use_new_model_creation_fix")
+    void setUseModelCreationFix(boolean value);
+
+    @Accessor("use_old_animations")
+    void setUseOldAnimations(boolean value);
+}
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/mixin/MixinOptionsScreen.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/mixin/MixinOptionsScreen.java
@@ -0,0 +1,37 @@
+package net.puzzlemc.gui.mixin;
+
+import eu.midnightdust.core.config.MidnightLibConfig;
+import eu.midnightdust.lib.util.screen.TexturedOverlayButtonWidget;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.util.Identifier;
+import net.puzzlemc.core.config.PuzzleConfig;
+import net.puzzlemc.gui.PuzzleClient;
+import net.puzzlemc.gui.screen.PuzzleOptionsScreen;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.option.OptionsScreen;
+import net.minecraft.text.Text;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.Objects;
+
+@Mixin(OptionsScreen.class)
+public abstract class MixinOptionsScreen extends Screen {
+    private static final Identifier PUZZLE_ICON_TEXTURE = new Identifier(PuzzleClient.id, "textures/gui/puzzle_button.png");
+
+    protected MixinOptionsScreen(Text title) {
+        super(title);
+    }
+
+    @Inject(at = @At("HEAD"), method = "init")
+    private void puzzle$init(CallbackInfo ci) {
+        if (PuzzleConfig.enablePuzzleButton) {
+            int i = 0;
+            if (FabricLoader.getInstance().isModLoaded("lod")) i = i + 358;
+            if (MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.FALSE)) i = i - 25;
+            this.addDrawableChild(new TexturedOverlayButtonWidget(this.width / 2 - 178 + i, this.height / 6 - 12, 20, 20, 0, 0, 20, PUZZLE_ICON_TEXTURE, 32, 64, (buttonWidget) -> (Objects.requireNonNull(this.client)).setScreen(new PuzzleOptionsScreen(this)), Text.translatable("midnightlib.overview.title")));
+        }
+    }
+}
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/PuzzleOptionsScreen.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/PuzzleOptionsScreen.java
@@ -0,0 +1,48 @@
+package net.puzzlemc.gui.screen;
+
+import net.minecraft.screen.ScreenTexts;
+import net.minecraft.text.Text;
+import net.puzzlemc.gui.PuzzleApi;
+import net.puzzlemc.gui.PuzzleClient;
+import net.puzzlemc.gui.screen.page.GraphicsPage;
+import net.puzzlemc.gui.screen.page.MiscPage;
+import net.puzzlemc.gui.screen.page.PerformancePage;
+import net.puzzlemc.gui.screen.page.ResourcesPage;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.util.math.MatrixStack;
+
+import java.util.Objects;
+
+public class PuzzleOptionsScreen extends Screen {
+
+    public PuzzleOptionsScreen(Screen parent) {
+        super(Text.translatable("puzzle.screen.title"));
+        this.parent = parent;
+    }
+    private final Screen parent;
+
+    @Override
+    protected void init() {
+        super.init();
+        if (!PuzzleClient.lateInitDone) PuzzleClient.lateInit();
+        GraphicsPage graphicsPage = new GraphicsPage(this);
+        MiscPage miscPage = new MiscPage(this);
+        PerformancePage performancePage = new PerformancePage(this);
+        ResourcesPage resourcesPage = new ResourcesPage(this);
+
+        if (!PuzzleApi.GRAPHICS_OPTIONS.isEmpty()) this.addDrawableChild(new ButtonWidget(this.width / 2 - 155, this.height / 6 + 48 - 6, 150, 20, graphicsPage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).setScreen(graphicsPage)));
+        if (!PuzzleApi.RESOURCE_OPTIONS.isEmpty()) this.addDrawableChild(new ButtonWidget(this.width / 2 + 5, this.height / 6 + 48 - 6, 150, 20, resourcesPage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).setScreen(resourcesPage)));
+        if (!PuzzleApi.PERFORMANCE_OPTIONS.isEmpty()) this.addDrawableChild(new ButtonWidget(this.width / 2 - 155, this.height / 6 + 72 - 6, 150, 20, performancePage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).setScreen(performancePage)));
+        if (!PuzzleApi.MISC_OPTIONS.isEmpty()) this.addDrawableChild(new ButtonWidget(this.width / 2 + 5, this.height / 6 + 72 - 6, 150, 20, miscPage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).setScreen(miscPage)));
+        this.addDrawableChild(new ButtonWidget(this.width / 2 - 100, this.height / 6 + 168, 200, 20, ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)));
+    }
+
+    @Override
+    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
+        this.renderBackground(matrices);
+
+        super.render(matrices, mouseX, mouseY, delta);
+        drawCenteredText(matrices, textRenderer, title, width/2, 15, 0xFFFFFF);
+    }
+}
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/AbstractPuzzleOptionsPage.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/AbstractPuzzleOptionsPage.java
@@ -0,0 +1,53 @@
+package net.puzzlemc.gui.screen.page;
+
+import net.minecraft.screen.ScreenTexts;
+import net.minecraft.text.Text;
+import net.puzzlemc.gui.screen.widget.PuzzleOptionListWidget;
+import net.puzzlemc.gui.screen.widget.PuzzleWidget;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.util.math.MatrixStack;
+
+import java.util.List;
+import java.util.Objects;
+
+public abstract class AbstractPuzzleOptionsPage extends Screen {
+    public PuzzleOptionListWidget list;
+    private final List<PuzzleWidget> options;
+    public List<Text> tooltip = null;
+
+    public AbstractPuzzleOptionsPage(Screen parent, Text title, List<PuzzleWidget> options) {
+        super(title);
+        this.parent = parent;
+        this.options = options;
+    }
+    private final Screen parent;
+
+    @Override
+    protected void init() {
+        this.list = new PuzzleOptionListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
+        list.addAll(options);
+        this.addSelectableChild(this.list);
+
+        super.init();
+
+        this.addDrawableChild(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)));
+    }
+
+    @Override
+    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
+        this.renderBackground(matrices);
+        if (client != null && client.world != null) this.list.setRenderBackground(false);
+        this.list.render(matrices, mouseX, mouseY, delta);
+
+        drawCenteredText(matrices, textRenderer, title, width/2, 15, 0xFFFFFF);
+        super.render(matrices, mouseX, mouseY, delta);
+        if (tooltip != null) {
+            if (this.list.getFocused() != null && (this.list.getHoveredEntry() == null || this.list.getHoveredEntry().button == null || !this.list.getHoveredEntry().button.isMouseOver(mouseX, mouseY))) {
+                renderTooltip(matrices, tooltip, this.list.getFocused().getX() + this.list.getFocused().getWidth(), this.list.getFocused().getY() + (this.list.getFocused().getHeight() * 2));
+            }
+            else renderTooltip(matrices, tooltip, mouseX, mouseY);
+        }
+        tooltip = null;
+    }
+}
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/GraphicsPage.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/GraphicsPage.java
@@ -0,0 +1,12 @@
+package net.puzzlemc.gui.screen.page;
+
+import net.minecraft.text.Text;
+import net.puzzlemc.gui.PuzzleApi;
+import net.minecraft.client.gui.screen.Screen;
+
+public class GraphicsPage extends AbstractPuzzleOptionsPage {
+
+    public GraphicsPage(Screen parent) {
+        super(parent, Text.translatable("puzzle.page.graphics"), PuzzleApi.GRAPHICS_OPTIONS);
+    }
+}
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/MiscPage.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/MiscPage.java
@@ -0,0 +1,12 @@
+package net.puzzlemc.gui.screen.page;
+
+import net.minecraft.text.Text;
+import net.puzzlemc.gui.PuzzleApi;
+import net.minecraft.client.gui.screen.Screen;
+
+public class MiscPage extends AbstractPuzzleOptionsPage {
+
+    public MiscPage(Screen parent) {
+        super(parent, Text.translatable("puzzle.page.misc"), PuzzleApi.MISC_OPTIONS);
+    }
+}
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/PerformancePage.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/PerformancePage.java
@@ -0,0 +1,12 @@
+package net.puzzlemc.gui.screen.page;
+
+import net.minecraft.text.Text;
+import net.puzzlemc.gui.PuzzleApi;
+import net.minecraft.client.gui.screen.Screen;
+
+public class PerformancePage extends AbstractPuzzleOptionsPage {
+
+    public PerformancePage(Screen parent) {
+        super(parent, Text.translatable("puzzle.page.performance"), PuzzleApi.PERFORMANCE_OPTIONS);
+    }
+}
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/ResourcesPage.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/ResourcesPage.java
@@ -0,0 +1,12 @@
+package net.puzzlemc.gui.screen.page;
+
+import net.minecraft.text.Text;
+import net.puzzlemc.gui.PuzzleApi;
+import net.minecraft.client.gui.screen.Screen;
+
+public class ResourcesPage extends AbstractPuzzleOptionsPage {
+
+    public ResourcesPage(Screen parent) {
+        super(parent, Text.translatable("puzzle.page.resources"), PuzzleApi.RESOURCE_OPTIONS);
+    }
+}
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/ButtonType.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/ButtonType.java
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleButtonWidget.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleButtonWidget.java
@@ -0,0 +1,19 @@
+package net.puzzlemc.gui.screen.widget;
+
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.Text;
+
+public class PuzzleButtonWidget extends ButtonWidget {
+    private final PuzzleWidget.TextAction title;
+
+    public PuzzleButtonWidget(int x, int y, int width, int height, PuzzleWidget.TextAction title, PressAction onPress) {
+        super(x, y, width, height, Text.of(""), onPress);
+        this.title = title;
+    }
+    @Override
+    public void renderButton(MatrixStack matrices, int mouseX, int mouseY, float delta) {
+        title.setTitle(this);
+        super.renderButton(matrices, mouseX, mouseY, delta);
+    }
+}
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleOptionListWidget.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleOptionListWidget.java
@@ -0,0 +1,129 @@
+package net.puzzlemc.gui.screen.widget;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.Element;
+import net.minecraft.client.gui.Selectable;
+import net.minecraft.client.gui.widget.ClickableWidget;
+import net.minecraft.client.gui.widget.ElementListWidget;
+import net.minecraft.client.resource.language.I18n;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableTextContent;
+import net.puzzlemc.gui.screen.page.AbstractPuzzleOptionsPage;
+import org.apache.logging.log4j.LogManager;
+
+import java.util.*;
+
+@Environment(EnvType.CLIENT)
+public class PuzzleOptionListWidget extends ElementListWidget<PuzzleOptionListWidget.ButtonEntry> {
+    TextRenderer textRenderer;
+
+    public PuzzleOptionListWidget(MinecraftClient minecraftClient, int i, int j, int k, int l, int m) {
+        super(minecraftClient, i, j, k, l, m);
+        this.centerListVertically = false;
+        textRenderer = minecraftClient.textRenderer;
+    }
+
+    public void addButton(ClickableWidget button, Text text) {
+        this.addEntry(ButtonEntry.create(button, text));
+    }
+
+    public void addAll(List<PuzzleWidget> buttons) {
+        for (PuzzleWidget button : buttons) {
+            if (button.buttonType == ButtonType.TEXT) {
+                this.addButton(null, button.descriptionText);
+            } else if (button.buttonType == ButtonType.BUTTON) {
+                this.addButton(new PuzzleButtonWidget(this.width / 2 + 25, 0, 150, 20, button.buttonTextAction, button.onPress), button.descriptionText);
+            } else if (button.buttonType == ButtonType.SLIDER) {
+                this.addButton(new PuzzleSliderWidget(button.min, button.max, this.width / 2 + 25, 0, 150, 20, button.defaultSliderValue.getAsInt(), button.buttonTextAction, button.changeSliderValue), button.descriptionText);
+            } else if (button.buttonType == ButtonType.TEXT_FIELD) {
+                this.addButton(new PuzzleTextFieldWidget(textRenderer, this.width / 2 + 25, 0, 150, 20, button.setTextValue, button.changeTextValue), button.descriptionText);
+            } else
+                LogManager.getLogger("Puzzle").warn("Button " + button + " is missing the buttonType variable. This shouldn't happen!");
+        }
+    }
+
+    public int getRowWidth() {
+        return 400;
+    }
+
+    protected int getScrollbarPositionX() {
+        return super.getScrollbarPositionX() + 60;
+    }
+
+    @Override
+    public ButtonEntry getHoveredEntry() {
+        return super.getHoveredEntry();
+    }
+
+    public static class ButtonEntry extends ElementListWidget.Entry<ButtonEntry> {
+        private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
+        private List<ClickableWidget> buttons = new ArrayList<>();
+        public final ClickableWidget button;
+        public final Text text;
+        private MinecraftClient client = MinecraftClient.getInstance();
+
+        private ButtonEntry(ClickableWidget button, Text text) {
+            if (button != null)
+                this.buttons.add(button);
+            this.button = button;
+            this.text = text;
+        }
+
+        public static ButtonEntry create(ClickableWidget button, Text text) {
+            return new ButtonEntry(button, text);
+        }
+
+        public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
+            if (button != null) {
+                button.y = y;
+                button.render(matrices, mouseX, mouseY, tickDelta);
+            }
+            if (button == null) drawCenteredText(matrices,textRenderer, Text.literal("－－－－－－ ").append(text).append(" －－－－－－"),x + 200,y+5,0xFFFFFF);
+            else drawTextWithShadow(matrices,textRenderer, text,x+15,y+5,0xFFFFFF);
+
+            if (!(client.currentScreen instanceof AbstractPuzzleOptionsPage page)) return;
+            if (button != null && (button.isMouseOver(mouseX, mouseY) || ((page.list.getHoveredEntry() == null || page.list.getHoveredEntry().button == null || !page.list.getHoveredEntry().button.isMouseOver(mouseX, mouseY)) && button.isFocused())) && text.getContent() instanceof TranslatableTextContent content) {
+                String key = null;
+                if (I18n.hasTranslation(content.getKey() + ".tooltip")) key = content.getKey() + ".tooltip";
+                else if (I18n.hasTranslation(content.getKey() + ".desc")) key = content.getKey() + ".desc";
+                if (key == null && content.getKey().endsWith(".title")) {
+                    String strippedContent = content.getKey().substring(0, content.getKey().length()-6);
+                    if (I18n.hasTranslation(strippedContent + ".tooltip")) key = strippedContent + ".tooltip";
+                    else if (I18n.hasTranslation(strippedContent + ".desc")) key = strippedContent + ".desc";
+                }
+
+                if (key != null) {
+                    List<Text> list = new ArrayList<>();
+                    for (String str : I18n.translate(key).split("\n"))
+                        list.add(Text.literal(str));
+                    page.tooltip = list;
+                }
+            }
+        }
+        public int getY() {
+            return button.y;
+        }
+        public int getX() {
+            return button.x;
+        }
+        public int getHeight() {
+            return button.getHeight();
+        }
+        public int getWidth() {
+            return button.getWidth();
+        }
+
+        public List<? extends Element> children() {
+            return buttons;
+        }
+
+        @Override
+        public List<? extends Selectable> selectableChildren() {
+            return buttons;
+        }
+    }
+}
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleSliderWidget.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleSliderWidget.java
@@ -1,26 +1,23 @@
 package net.puzzlemc.gui.screen.widget;

+import net.minecraft.client.gui.widget.SliderWidget;
+import net.minecraft.text.Text;

-import net.minecraft.client.gui.components.AbstractSliderButton;
-import net.minecraft.network.chat.Component;
-
-public class PuzzleSliderWidget extends AbstractSliderButton {
+public class PuzzleSliderWidget extends SliderWidget {
    private final int min;
    private final int max;
-    private final PuzzleWidget.TextAction setComponentAction;
+    private final PuzzleWidget.TextAction setTextAction;
    private final PuzzleWidget.ChangeSliderValueAction changeAction;

-    public PuzzleSliderWidget(int min, int max, int x, int y, int width, int height, float defaultValue, PuzzleWidget.TextAction setComponentAction, PuzzleWidget.ChangeSliderValueAction changeAction) {
-        super(x,y,width,height, Component.empty(),(defaultValue-min) / (max - min));
+    public PuzzleSliderWidget(int min, int max, int x, int y, int width, int height, float defaultValue, PuzzleWidget.TextAction setTextAction, PuzzleWidget.ChangeSliderValueAction changeAction) {
+        super(x,y,width,height,Text.of(""),(defaultValue-min) / (max - min));

        this.min = min;
        this.max = max;

-        this.setComponentAction = setComponentAction;
+        this.setTextAction = setTextAction;
        this.changeAction = changeAction;
-        try {
-            this.updateMessage();
-        } catch (Exception e) {e.fillInStackTrace(); this.visible = false;}
+        this.updateMessage();
    }
    public int getInt() {
        int difference = max - min;
@@ -33,7 +30,7 @@ public class PuzzleSliderWidget extends AbstractSliderButton {

    @Override
    protected void updateMessage() {
-        this.setComponentAction.setTitle(this);
+        this.setTextAction.setTitle(this);
    }

    @Override
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleTextFieldWidget.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleTextFieldWidget.java
@@ -0,0 +1,23 @@
+package net.puzzlemc.gui.screen.widget;
+
+import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.widget.TextFieldWidget;
+import net.minecraft.text.Text;
+
+public class PuzzleTextFieldWidget extends TextFieldWidget {
+    private final PuzzleWidget.SetTextValueAction setValueAction;
+    private final PuzzleWidget.ChangeTextValueAction change;
+
+    public PuzzleTextFieldWidget(TextRenderer textRenderer, int x, int y, int width, int height, PuzzleWidget.SetTextValueAction setValue, PuzzleWidget.ChangeTextValueAction change) {
+        super(textRenderer, x, y, width, height, Text.of(""));
+        this.setValueAction = setValue;
+        this.change = change;
+        setValueAction.setTextValue(this);
+    }
+    @Override
+    public void write(String text) {
+        super.write(text);
+        this.change.onChange(this);
+        setValueAction.setTextValue(this);
+    }
+}
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleWidget.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleWidget.java
@@ -1,9 +1,11 @@
 package net.puzzlemc.gui.screen.widget;

-import net.minecraft.client.gui.components.AbstractWidget;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.components.EditBox;
-import net.minecraft.network.chat.Component;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.gui.widget.ClickableWidget;
+import net.minecraft.client.gui.widget.TextFieldWidget;
+import net.minecraft.text.Text;

 import java.util.function.IntSupplier;

@@ -11,9 +13,9 @@ public class PuzzleWidget {
    public ButtonType buttonType;
    public int min;
    public int max;
-    public Component descriptionText;
+    public Text descriptionText;
    public TextAction buttonTextAction;
-    public Button.OnPress onPress;
+    public ButtonWidget.PressAction onPress;
    public PuzzleWidget.SetTextValueAction setTextValue;
    public IntSupplier defaultSliderValue;
    public PuzzleWidget.ChangeTextValueAction changeTextValue;
@@ -23,7 +25,7 @@ public class PuzzleWidget {
     * Puzzle Text Widget Container
     * @param descriptionText The text you want to display.
     */
-    public PuzzleWidget(Component descriptionText) {
+    public PuzzleWidget(Text descriptionText) {
        this.buttonType = ButtonType.TEXT;
        this.descriptionText = descriptionText;
    }
@@ -34,7 +36,7 @@ public class PuzzleWidget {
     * @param getTitle Function to set the text on the button.
     * @param onPress Function to call when the user presses the button.
     */
-    public PuzzleWidget(Component descriptionText, PuzzleWidget.TextAction getTitle, Button.OnPress onPress) {
+    public PuzzleWidget(Text descriptionText, PuzzleWidget.TextAction getTitle, ButtonWidget.PressAction onPress) {
        this.buttonType = ButtonType.BUTTON;
        this.descriptionText = descriptionText;
        this.buttonTextAction = getTitle;
@@ -43,7 +45,7 @@ public class PuzzleWidget {
    /**
     * Puzzle Slider Widget Container
     */
-    public PuzzleWidget(int min, int max, Component descriptionText, IntSupplier defaultSliderValue, PuzzleWidget.TextAction setTextAction, PuzzleWidget.ChangeSliderValueAction changeAction) {
+    public PuzzleWidget(int min, int max, Text descriptionText, IntSupplier defaultSliderValue, PuzzleWidget.TextAction setTextAction, PuzzleWidget.ChangeSliderValueAction changeAction) {
        this.buttonType = ButtonType.SLIDER;
        this.min = min;
        this.max = max;
@@ -55,7 +57,7 @@ public class PuzzleWidget {
    /**
     * Puzzle Text Field Widget Container (WIP - Doesn't work)
     */
-    public PuzzleWidget(int min, int max, Component descriptionText, PuzzleWidget.SetTextValueAction setValue, ChangeTextValueAction changeAction) {
+    public PuzzleWidget(int min, int max, Text descriptionText, PuzzleWidget.SetTextValueAction setValue, ChangeTextValueAction changeAction) {
        this.buttonType = ButtonType.TEXT_FIELD;
        this.min = min;
        this.max = max;
@@ -63,16 +65,20 @@ public class PuzzleWidget {
        this.setTextValue = setValue;
        this.changeTextValue = changeAction;
    }
+    @Environment(EnvType.CLIENT)
    public interface ChangeTextValueAction {
-        void onChange(EditBox textField);
+        void onChange(TextFieldWidget textField);
    }
+    @Environment(EnvType.CLIENT)
    public interface ChangeSliderValueAction {
        void onChange(PuzzleSliderWidget slider);
    }
+    @Environment(EnvType.CLIENT)
    public interface SetTextValueAction {
-        void setTextValue(EditBox textField);
+        void setTextValue(TextFieldWidget textField);
    }
+    @Environment(EnvType.CLIENT)
    public interface TextAction {
-        void setTitle(AbstractWidget button);
+        void setTitle(ClickableWidget button);
    }
 }
--- a/puzzle-gui/src/main/resources/assets/puzzle/icon.png
+++ b/puzzle-gui/src/main/resources/assets/puzzle/icon.png
--- a/puzzle-gui/src/main/resources/assets/puzzle/textures/gui/puzzle_button.png
+++ b/puzzle-gui/src/main/resources/assets/puzzle/textures/gui/puzzle_button.png
--- a/puzzle-gui/src/main/resources/fabric.mod.json
+++ b/puzzle-gui/src/main/resources/fabric.mod.json
@@ -0,0 +1,48 @@
+{
+  "schemaVersion": 1,
+  "id": "puzzle-gui",
+  "version": "${version}",
+
+  "name": "Puzzle GUI",
+  "description": "Unites optifine replacement mods in a clean & vanilla-style gui",
+  "authors": [
+    "PuzzleMC",
+    "Motschen"
+  ],
+  "contact": {
+    "homepage": "https://www.midnightdust.eu/",
+    "sources": "https://github.com/TeamMidnightDust/Puzzle",
+    "issues": "https://github.com/TeamMidnightDust/Puzzle/issues"
+  },
+
+  "license": "MIT",
+  "icon": "assets/puzzle/icon.png",
+
+  "environment": "client",
+  "entrypoints": {
+    "client": [
+      "net.puzzlemc.gui.PuzzleClient"
+    ],
+    "modmenu": [
+      "net.puzzlemc.gui.config.ModMenuIntegration"
+    ]
+  },
+  "custom": {
+    "modmenu": {
+      "parent": "puzzle"
+    }
+  },
+
+  "mixins": [
+    "puzzle-gui.mixins.json"
+  ],
+
+  "depends": {
+    "fabric": "*",
+    "midnightlib": "*"
+  },
+  "breaks": {
+    "citresewn": "<=1.0.0+1.18.2",
+    "entity_texture_features": "<3.0.0"
+  }
+}
--- a/puzzle-gui/src/main/resources/puzzle-gui.mixins.json
+++ b/puzzle-gui/src/main/resources/puzzle-gui.mixins.json
@@ -3,7 +3,8 @@
  "package": "net.puzzlemc.gui.mixin",
  "compatibilityLevel": "JAVA_17",
  "client": [
-    "MixinOptionsScreen"
+    "MixinOptionsScreen",
+    "CemConfigAccessor"
  ],
  "injectors": {
    "defaultRequire": 1
--- a/puzzle-models/build.gradle
+++ b/puzzle-models/build.gradle
@@ -0,0 +1,14 @@
+archivesBaseName = "puzzle-models"
+
+loom {
+    accessWidenerPath =  file("src/main/resources/puzzle-models.accesswidener")
+}
+repositories {
+    maven {
+        url = "https://api.modrinth.com/maven"
+    }
+}
+dependencies {
+    api project(":puzzle-base")
+    modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
+}
--- a/puzzle-models/src/main/java/net/puzzlemc/models/mixin/MixinModelElementDeserializer.java
+++ b/puzzle-models/src/main/java/net/puzzlemc/models/mixin/MixinModelElementDeserializer.java
@@ -2,43 +2,43 @@ package net.puzzlemc.models.mixin;

 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import net.minecraft.client.renderer.block.model.BlockElement;
-import net.minecraft.util.GsonHelper;
+import net.minecraft.client.render.model.json.ModelElement;
+import net.minecraft.util.JsonHelper;
+import net.minecraft.util.math.Vec3f;
 import net.puzzlemc.core.config.PuzzleConfig;
-import org.joml.Vector3f;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

-@Mixin(BlockElement.Deserializer.class)
+@Mixin(ModelElement.Deserializer.class)
 public abstract class MixinModelElementDeserializer {
-    @Shadow protected abstract Vector3f getVector3f(JsonObject jsonObject, String string);
+    @Shadow protected abstract Vec3f deserializeVec3f(JsonObject object, String name);

-    @Inject(at = @At("HEAD"),method = "getAngle", cancellable = true)
+    @Inject(at = @At("HEAD"),method = "deserializeRotationAngle", cancellable = true)
    private void puzzle$deserializeRotationAngle(JsonObject object, CallbackInfoReturnable<Float> cir) {
        if (PuzzleConfig.unlimitedRotations) {
-            float angle = GsonHelper.getAsFloat(object, "angle");
+            float angle = JsonHelper.getFloat(object, "angle");
            cir.setReturnValue(angle);
        }
    }
-    @Inject(at = @At("HEAD"),method = "getTo", cancellable = true)
-    private void puzzle$deserializeTo(JsonObject object, CallbackInfoReturnable<Vector3f> cir) {
+    @Inject(at = @At("HEAD"),method = "deserializeTo", cancellable = true)
+    private void puzzle$deserializeTo(JsonObject object, CallbackInfoReturnable<Vec3f> cir) {
        if (PuzzleConfig.biggerModels) {
-            Vector3f vec3f = this.getVector3f(object, "to");
-            if (!(vec3f.x < -32.0F) && !(vec3f.y < -32.0F) && !(vec3f.z < -32.0F) && !(vec3f.x > 48.0F) && !(vec3f.y > 48.0F) && !(vec3f.z > 48.0F)) {
+            Vec3f vec3f = this.deserializeVec3f(object, "to");
+            if (!(vec3f.getX() < -32.0F) && !(vec3f.getY() < -32.0F) && !(vec3f.getZ() < -32.0F) && !(vec3f.getX() > 48.0F) && !(vec3f.getY() > 48.0F) && !(vec3f.getZ() > 48.0F)) {
                cir.setReturnValue(vec3f);
            } else {
                throw new JsonParseException("'to' specifier exceeds the allowed boundaries: " + vec3f);
            }
        }
    }
-    @Inject(at = @At("HEAD"),method = "getFrom", cancellable = true)
-    private void puzzle$deserializeFrom(JsonObject object, CallbackInfoReturnable<Vector3f> cir) {
+    @Inject(at = @At("HEAD"),method = "deserializeFrom", cancellable = true)
+    private void puzzle$deserializeFrom(JsonObject object, CallbackInfoReturnable<Vec3f> cir) {
        if (PuzzleConfig.biggerModels) {
-            Vector3f vec3f = this.getVector3f(object, "from");
-            if (!(vec3f.x < -32.0F) && !(vec3f.y < -32.0F) && !(vec3f.z < -32.0F) && !(vec3f.x > 48.0F) && !(vec3f.y > 48.0F) && !(vec3f.z > 48.0F)) {
+            Vec3f vec3f = this.deserializeVec3f(object, "from");
+            if (!(vec3f.getX() < -32.0F) && !(vec3f.getY() < -32.0F) && !(vec3f.getZ() < -32.0F) && !(vec3f.getX() > 48.0F) && !(vec3f.getY() > 48.0F) && !(vec3f.getZ() > 48.0F)) {
                cir.setReturnValue(vec3f);
            } else {
                throw new JsonParseException("'from' specifier exceeds the allowed boundaries: " + vec3f);
--- a/puzzle-models/src/main/resources/assets/puzzle/icon.png
+++ b/puzzle-models/src/main/resources/assets/puzzle/icon.png
--- a/puzzle-models/src/main/resources/fabric.mod.json
+++ b/puzzle-models/src/main/resources/fabric.mod.json
@@ -0,0 +1,35 @@
+{
+  "schemaVersion": 1,
+  "id": "puzzle-models",
+  "version": "${version}",
+
+  "name": "Puzzle Models",
+  "description": "Provides more freedom for item and block models!",
+  "authors": [
+    "PuzzleMC",
+    "Motschen"
+  ],
+  "contact": {
+    "homepage": "https://www.midnightdust.eu/",
+    "sources": "https://github.com/TeamMidnightDust/Puzzle",
+    "issues": "https://github.com/TeamMidnightDust/Puzzle/issues"
+  },
+  "custom": {
+    "modmenu": {
+      "parent": "puzzle"
+    }
+  },
+
+  "license": "MIT",
+  "icon": "assets/puzzle/icon.png",
+
+  "environment": "client",
+  "accessWidener" : "puzzle-models.accesswidener",
+  "mixins": [
+    "puzzle-models.mixins.json"
+  ],
+
+  "depends": {
+    "fabric": "*"
+  }
+}
--- a/puzzle-models/src/main/resources/puzzle-models.accesswidener
+++ b/puzzle-models/src/main/resources/puzzle-models.accesswidener
@@ -0,0 +1,2 @@
+accessWidener	v1	named
+accessible   class   net/minecraft/client/render/model/json/ModelElement$Deserializer
--- a/puzzle-models/src/main/resources/puzzle-models.mixins.json
+++ b/puzzle-models/src/main/resources/puzzle-models.mixins.json
--- a/puzzle-splashscreen/build.gradle
+++ b/puzzle-splashscreen/build.gradle
@@ -0,0 +1,10 @@
+archivesBaseName = "puzzle-splashscreen"
+repositories {
+    maven {
+        url = "https://api.modrinth.com/maven"
+    }
+}
+dependencies {
+    api project(":puzzle-base")
+    modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
+}
--- a/puzzle-splashscreen/src/main/java/net/puzzlemc/splashscreen/PuzzleSplashScreen.java
+++ b/puzzle-splashscreen/src/main/java/net/puzzlemc/splashscreen/PuzzleSplashScreen.java
@@ -0,0 +1,158 @@
+package net.puzzlemc.splashscreen;
+
+import eu.midnightdust.lib.util.MidnightColorUtil;
+import net.fabricmc.api.ClientModInitializer;
+import net.minecraft.client.texture.NativeImageBackedTexture;
+import net.minecraft.util.Util;
+import net.minecraft.util.math.ColorHelper;
+import net.puzzlemc.core.config.PuzzleConfig;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
+import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.resource.metadata.TextureResourceMetadata;
+import net.minecraft.client.texture.NativeImage;
+import net.minecraft.client.texture.ResourceTexture;
+import net.minecraft.resource.DefaultResourcePack;
+import net.minecraft.resource.ResourceManager;
+import net.minecraft.resource.ResourceType;
+import net.minecraft.util.Identifier;
+import org.apache.logging.log4j.LogManager;
+
+import java.awt.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.Properties;
+
+public class PuzzleSplashScreen implements ClientModInitializer {
+    public static final Identifier LOGO = new Identifier("textures/gui/title/mojangstudios.png");
+    public static final Identifier BACKGROUND = new Identifier("optifine/splash_background.png");
+    public static File CONFIG_PATH = new File(String.valueOf(FabricLoader.getInstance().getConfigDir().resolve(".puzzle_cache")));
+    public static Path LOGO_TEXTURE = Paths.get(CONFIG_PATH + "/mojangstudios.png");
+    public static Path BACKGROUND_TEXTURE = Paths.get(CONFIG_PATH + "/splash_background.png");
+    private static final MinecraftClient client = MinecraftClient.getInstance();
+    private static boolean keepBackground = true;
+
+    public static void resetColors() {
+        PuzzleConfig.backgroundColor = 15675965;
+        PuzzleConfig.progressBarColor = 16777215;
+        PuzzleConfig.progressBarBackgroundColor = 15675965;
+        PuzzleConfig.progressFrameColor = 16777215;
+        PuzzleConfig.disableBlend = false;
+        PuzzleConfig.write("puzzle");
+    }
+
+    public void onInitializeClient() {
+        if (!CONFIG_PATH.exists()) { // Run when config directory is nonexistent //
+            if (CONFIG_PATH.mkdir()) { // Create our custom config directory //
+                if (Util.getOperatingSystem().equals(Util.OperatingSystem.WINDOWS)) {
+                    try {
+                        Files.setAttribute(CONFIG_PATH.toPath(), "dos:hidden", true);
+                    } catch (IOException ignored) {
+                    }
+                }
+            }
+        }
+        ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(new SimpleSynchronousResourceReloadListener() {
+            @Override
+            public Identifier getFabricId() {
+                return new Identifier("puzzle", "splash_screen");
+            }
+
+            public void method_14491(ResourceManager manager) {
+                reload(manager);
+            }
+            @Override
+            public void reload(ResourceManager manager) {
+                if (PuzzleConfig.resourcepackSplashScreen) {
+                    PuzzleSplashScreen.resetColors();
+                    client.getTextureManager().registerTexture(LOGO, new LogoTexture(LOGO));
+                    client.getTextureManager().registerTexture(BACKGROUND, new LogoTexture(BACKGROUND));
+
+                    manager.findResources("optifine", path -> path.getPath().contains("color.properties")).forEach((id, resource) -> {
+                        try (InputStream stream = manager.getResource(id).get().getInputStream()) {
+                            Properties properties = new Properties();
+                            properties.load(stream);
+
+                            if (properties.get("screen.loading") != null) {
+                                PuzzleConfig.backgroundColor = MidnightColorUtil.hex2Rgb(properties.get("screen.loading").toString()).getRGB();
+                            }
+                            if (properties.get("screen.loading.bar") != null) {
+                                PuzzleConfig.progressBarBackgroundColor = MidnightColorUtil.hex2Rgb(properties.get("screen.loading.bar").toString()).getRGB();
+                            }
+                            if (properties.get("screen.loading.progress") != null) {
+                                PuzzleConfig.progressBarColor = MidnightColorUtil.hex2Rgb(properties.get("screen.loading.progress").toString()).getRGB();
+                            }
+                            if (properties.get("screen.loading.outline") != null) {
+                                PuzzleConfig.progressFrameColor = MidnightColorUtil.hex2Rgb(properties.get("screen.loading.outline").toString()).getRGB();
+                            }
+                            if (properties.get("screen.loading.blend") != null) {
+                                PuzzleConfig.disableBlend = properties.get("screen.loading.blend").toString().equals("off");
+                                PuzzleConfig.progressFrameColor = MidnightColorUtil.hex2Rgb(properties.get("screen.loading.outline").toString()).getRGB();
+                            }
+                            PuzzleConfig.write("puzzle");
+                        } catch (Exception e) {
+                            LogManager.getLogger("Puzzle").error("Error occurred while loading color.properties " + id.toString(), e);
+                        }
+                    });
+                    manager.findResources("textures", path -> path.getPath().contains("mojangstudios.png")).forEach((id, resource) -> {
+                        try (InputStream stream = manager.getResource(id).get().getInputStream()) {
+                            Files.copy(stream, LOGO_TEXTURE, StandardCopyOption.REPLACE_EXISTING);
+                            InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.LOGO_TEXTURE));
+                            client.getTextureManager().registerTexture(LOGO, new NativeImageBackedTexture(NativeImage.read(input)));
+                        } catch (Exception e) {
+                            LogManager.getLogger("Puzzle").error("Error occurred while loading custom minecraft logo " + id.toString(), e);
+                        }
+                    });
+                    manager.findResources("puzzle", path -> path.getPath().contains("splash_background.png")).forEach((id, resource) -> {
+                        try (InputStream stream = manager.getResource(id).get().getInputStream()) {
+                            Files.copy(stream, BACKGROUND_TEXTURE, StandardCopyOption.REPLACE_EXISTING);
+                            InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.BACKGROUND_TEXTURE));
+                            client.getTextureManager().registerTexture(BACKGROUND, new NativeImageBackedTexture(NativeImage.read(input)));
+                            keepBackground = true;
+                        } catch (Exception e) {
+                            LogManager.getLogger("Puzzle").error("Error occurred while loading custom splash background " + id.toString(), e);
+                        }
+                    });
+                    if (!keepBackground) {
+                        try {
+                            Files.delete(BACKGROUND_TEXTURE);
+                        } catch (Exception ignored) {}
+                    }
+                    keepBackground = false;
+                }
+            }
+        });
+    }
+    @Environment(EnvType.CLIENT)
+    public static class LogoTexture extends ResourceTexture {
+        public LogoTexture(Identifier logo) { super(logo); }
+
+        protected TextureData loadTextureData(ResourceManager resourceManager) {
+            MinecraftClient minecraftClient = MinecraftClient.getInstance();
+            DefaultResourcePack defaultResourcePack = minecraftClient.getResourcePackProvider().getPack();
+            try {
+                InputStream inputStream = defaultResourcePack.open(ResourceType.CLIENT_RESOURCES, LOGO);
+                TextureData var6;
+                try {
+                    var6 = new TextureData(new TextureResourceMetadata(true, true), NativeImage.read(inputStream));
+                } finally {
+                    if (inputStream != null) {
+                        inputStream.close();
+                    }
+                }
+                return var6;
+            } catch (IOException var18) {
+                return new TextureData(var18);
+            }
+        }
+    }
+}
--- a/puzzle-splashscreen/src/main/java/net/puzzlemc/splashscreen/mixin/MixinSplashScreen.java
+++ b/puzzle-splashscreen/src/main/java/net/puzzlemc/splashscreen/mixin/MixinSplashScreen.java
@@ -0,0 +1,115 @@
+package net.puzzlemc.splashscreen.mixin;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Overlay;
+import net.minecraft.client.gui.screen.SplashOverlay;
+import net.minecraft.client.render.GameRenderer;
+import net.minecraft.client.texture.NativeImage;
+import net.minecraft.client.texture.NativeImageBackedTexture;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.Util;
+import net.minecraft.util.math.MathHelper;
+import net.puzzlemc.core.config.PuzzleConfig;
+import net.puzzlemc.splashscreen.PuzzleSplashScreen;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.*;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.util.function.IntSupplier;
+
+@Mixin(value = SplashOverlay.class, priority = 2000)
+public abstract class MixinSplashScreen extends Overlay {
+    @Shadow @Final static Identifier LOGO;
+    @Shadow private long reloadCompleteTime;
+
+    @Shadow
+    private static int withAlpha(int color, int alpha) {
+        return 0;
+    }
+
+    @Shadow @Final private MinecraftClient client;
+
+    @Shadow @Final private boolean reloading;
+
+    @Shadow private long reloadStartTime;
+
+    @Inject(method = "init(Lnet/minecraft/client/MinecraftClient;)V", at = @At("TAIL"))
+    private static void puzzle$initSplashscreen(MinecraftClient client, CallbackInfo ci) { // Load our custom textures at game start //
+        if (PuzzleConfig.resourcepackSplashScreen) {
+            if (PuzzleSplashScreen.LOGO_TEXTURE.toFile().exists()) {
+                try {
+                    InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.LOGO_TEXTURE));
+                    client.getTextureManager().registerTexture(LOGO, new NativeImageBackedTexture(NativeImage.read(input)));
+                } catch (IOException ignored) {
+                }
+            }
+            if (PuzzleSplashScreen.BACKGROUND_TEXTURE.toFile().exists()) {
+                try {
+                    InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.BACKGROUND_TEXTURE));
+                    client.getTextureManager().registerTexture(PuzzleSplashScreen.BACKGROUND, new NativeImageBackedTexture(NativeImage.read(input)));
+                } catch (IOException ignored) {
+                }
+            }
+        }
+    }
+    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Ljava/util/function/IntSupplier;getAsInt()I"))
+    private int puzzle$modifyBackground(IntSupplier instance) { // Set the Progress Bar Frame Color to our configured value //
+        return (!PuzzleConfig.resourcepackSplashScreen || PuzzleConfig.progressBarBackgroundColor == 15675965) ? instance.getAsInt() : PuzzleConfig.backgroundColor | 255 << 24;
+    }
+    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;blendFunc(II)V", shift = At.Shift.AFTER), remap = false)
+    private void puzzle$betterBlend(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+        if (PuzzleConfig.disableBlend) RenderSystem.defaultBlendFunc();
+    }
+    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/Window;getScaledWidth()I", shift = At.Shift.BEFORE))
+    private void puzzle$renderSplashBackground(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+        if (Files.exists(PuzzleSplashScreen.BACKGROUND_TEXTURE)) {
+            int width = client.getWindow().getScaledWidth();
+            int height = client.getWindow().getScaledHeight();
+            long l = Util.getMeasuringTimeMs();
+            float f = this.reloadCompleteTime > -1L ? (float)(l - this.reloadCompleteTime) / 1000.0F : -1.0F;
+            float g = this.reloadStartTime> -1L ? (float)(l - this.reloadStartTime) / 500.0F : -1.0F;
+            float s;
+            if (f >= 1.0F)
+                s = 1.0F - MathHelper.clamp(f - 1.0F, 0.0F, 1.0F);
+            else if (reloading)
+                s = MathHelper.clamp(g, 0.0F, 1.0F);
+            else
+                s = 1.0F;
+            RenderSystem.setShaderTexture(0, PuzzleSplashScreen.BACKGROUND);
+            RenderSystem.enableBlend();
+            RenderSystem.blendEquation(32774);
+            RenderSystem.defaultBlendFunc();
+            RenderSystem.setShader(GameRenderer::getPositionTexShader);
+            RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, s);
+            drawTexture(matrices, 0, 0, 0, 0, 0, width, height, width, height);
+            RenderSystem.defaultBlendFunc();
+            RenderSystem.disableBlend();
+        }
+    }
+    @Inject(method = "renderProgressBar", at = @At("HEAD"))
+    private void puzzle$addProgressBarBackground(MatrixStack matrices, int minX, int minY, int maxX, int maxY, float opacity, CallbackInfo ci) {
+        RenderSystem.disableBlend();
+        if (!PuzzleConfig.resourcepackSplashScreen || PuzzleConfig.progressBarBackgroundColor == 15675965) return;
+        long l = Util.getMeasuringTimeMs();
+        float f = this.reloadCompleteTime > -1L ? (float)(l - this.reloadCompleteTime) / 1000.0F : -1.0F;
+        int m = MathHelper.ceil((1.0F - MathHelper.clamp(f - 1.0F, 0.0F, 1.0F)) * 255.0F);
+        fill(matrices, minX, minY, maxX, maxY, withAlpha(PuzzleConfig.progressBarBackgroundColor, m));
+    }
+
+    @ModifyArg(method = "renderProgressBar", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/SplashOverlay;fill(Lnet/minecraft/client/util/math/MatrixStack;IIIII)V"), index = 5)
+    private int puzzle$modifyProgressFrame(int color) { // Set the Progress Bar Frame Color to our configured value //
+        return (!PuzzleConfig.resourcepackSplashScreen || PuzzleConfig.progressFrameColor == 16777215) ? color : PuzzleConfig.progressFrameColor | 255 << 24;
+    }
+    @ModifyArg(method = "renderProgressBar", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/SplashOverlay;fill(Lnet/minecraft/client/util/math/MatrixStack;IIIII)V", ordinal = 0), index = 5)
+    private int puzzle$modifyProgressColor(int color) { // Set the Progress Bar Color to our configured value //
+        return (!PuzzleConfig.resourcepackSplashScreen || PuzzleConfig.progressBarColor == 16777215) ? color : PuzzleConfig.progressBarColor | 255 << 24;
+    }
+}
--- a/puzzle-splashscreen/src/main/resources/assets/puzzle/icon.png
+++ b/puzzle-splashscreen/src/main/resources/assets/puzzle/icon.png
--- a/puzzle-splashscreen/src/main/resources/fabric.mod.json
+++ b/puzzle-splashscreen/src/main/resources/fabric.mod.json
@@ -0,0 +1,40 @@
+{
+  "schemaVersion": 1,
+  "id": "puzzle-splashscreen",
+  "version": "${version}",
+
+  "name": "Puzzle Splash Screen",
+  "description": "Allows resourcepacks to define a custom splash screen",
+  "authors": [
+    "PuzzleMC",
+    "Motschen"
+  ],
+  "contact": {
+    "homepage": "https://www.midnightdust.eu/",
+    "sources": "https://github.com/TeamMidnightDust/Puzzle",
+    "issues": "https://github.com/TeamMidnightDust/Puzzle/issues"
+  },
+
+  "license": "MIT",
+  "icon": "assets/puzzle/icon.png",
+
+  "environment": "client",
+  "entrypoints": {
+    "client": [
+      "net.puzzlemc.splashscreen.PuzzleSplashScreen"
+    ]
+  },
+  "custom": {
+    "modmenu": {
+      "parent": "puzzle"
+    }
+  },
+
+  "mixins": [
+    "puzzle-splashscreen.mixins.json"
+  ],
+
+  "depends": {
+    "fabric": "*"
+  }
+}
--- a/puzzle-splashscreen/src/main/resources/puzzle-splashscreen.mixins.json
+++ b/puzzle-splashscreen/src/main/resources/puzzle-splashscreen.mixins.json
@@ -3,8 +3,7 @@
  "package": "net.puzzlemc.splashscreen.mixin",
  "compatibilityLevel": "JAVA_17",
  "client": [
-    "MixinSplashScreen",
-    "RenderPipelinesAccessor"
+    "MixinSplashScreen"
  ],
  "injectors": {
    "defaultRequire": 1
--- a/puzzle-splashscreen_example_pack.zip
+++ b/puzzle-splashscreen_example_pack.zip
--- a/settings.gradle
+++ b/settings.gradle
@@ -0,0 +1,14 @@
+pluginManagement {
+    repositories {
+        maven {
+            name = 'Fabric'
+            url = 'https://maven.fabricmc.net/'
+        }
+        gradlePluginPortal()
+    }
+}
+include 'puzzle-base'
+
+include 'puzzle-splashscreen'
+include 'puzzle-models'
+include 'puzzle-gui'
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,32 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenCentral()
-        gradlePluginPortal()
-        maven("https://maven.fabricmc.net/")
-        maven("https://maven.architectury.dev")
-        maven("https://maven.minecraftforge.net")
-        maven("https://maven.neoforged.net/releases/")
-        maven("https://maven.kikugie.dev/snapshots")
-    }
-}
-
-plugins {
-    id("dev.kikugie.stonecutter") version "0.7"
-}
-
-stonecutter {
-    centralScript = "build.gradle.kts"
-    kotlinController = true
-    shared {
-        fun mc(loader: String, vararg versions: String) {
-            for (version in versions) vers("$version-$loader", version)
-        }
-        //i would recommend to use neoforge for mc > 1.20.1, i haven't tested template for forge on versions higher than that
-        mc("fabric","1.20.1", "1.21.1", "1.21.5", "1.21.8", "1.21.10")
-        //WARNING: neoforge uses mods.toml instead of neoforge.mods.toml for versions 1.20.4 (?) and earlier
-        mc("neoforge", "1.21.1", "1.21.5", "1.21.8", "1.21.10")
-    }
-    create(rootProject)
-}
-
-rootProject.name = "Puzzle"
--- a/src/main/java/net/puzzlemc/core/PuzzleClient.java
+++ b/src/main/java/net/puzzlemc/core/PuzzleClient.java
@@ -1,89 +0,0 @@
-package net.puzzlemc.core;
-
-import net.minecraft.resources.ResourceLocation;
-
-import net.puzzlemc.gui.screen.PuzzleOptionsScreen;
-import net.puzzlemc.splashscreen.PuzzleSplashScreen;
-
-import static net.puzzlemc.core.PuzzleCore.MOD_ID;
-
-//? fabric {
-import com.terraformersmc.modmenu.api.ConfigScreenFactory;
-import com.terraformersmc.modmenu.api.ModMenuApi;
-import net.fabricmc.api.ClientModInitializer;
-import net.minecraft.server.packs.PackType;
-//? if >= 1.21.9 {
-import net.fabricmc.fabric.api.resource.v1.ResourceLoader;
-//?} else {
-/*import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
-import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener;
-import net.minecraft.server.packs.resources.ResourceManager;
-*///?}
-
-public class PuzzleClient implements ClientModInitializer, ModMenuApi {
-
-    @Override
-    public ConfigScreenFactory<?> getModConfigScreenFactory() {
-        return PuzzleOptionsScreen::new;
-    }
-
-    @Override
-    public void onInitializeClient() {
-        PuzzleCore.initModules();
-
-        //ResourceManagerHelper.get(PackType.CLIENT_RESOURCES).registerReloadListener
-        //? if >= 1.21.9 {
-        ResourceLoader.get(PackType.CLIENT_RESOURCES).registerReloader(ResourceLocation.fromNamespaceAndPath(MOD_ID, "splash_screen"), PuzzleSplashScreen.ReloadListener.INSTANCE);
-        //?} else {
-        /*ResourceManagerHelper.get(PackType.CLIENT_RESOURCES).registerReloadListener(new SimpleSynchronousResourceReloadListener() {
-            @Override
-            public ResourceLocation getFabricId() {
-                return ResourceLocation.fromNamespaceAndPath(MOD_ID, "splash_screen");
-            }
-            @Override
-            public void onResourceManagerReload(ResourceManager manager) {
-                PuzzleSplashScreen.ReloadListener.INSTANCE.onResourceManagerReload(manager);
-            }
-        });
-        *///?}
-    }
-}
-//?}
-
-//? neoforge {
-/*import net.neoforged.api.distmarker.Dist;
-import net.neoforged.bus.api.SubscribeEvent;
-import net.neoforged.fml.ModList;
-import net.neoforged.fml.common.EventBusSubscriber;
-import net.neoforged.fml.common.Mod;
-
-import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
-//? if >= 1.21.5 {
-import net.neoforged.neoforge.client.event.AddClientReloadListenersEvent;
-//?} else {
-/^import net.neoforged.neoforge.client.event.RegisterClientReloadListenersEvent;
-^///?}
-
-@Mod(value = MOD_ID, dist = Dist.CLIENT)
-public class PuzzleClient {
-    public PuzzleClient() {
-        PuzzleCore.initModules();
-        ModList.get().getModContainerById(MOD_ID).orElseThrow().registerExtensionPoint(IConfigScreenFactory.class, (client, parent) -> new PuzzleOptionsScreen(parent));
-    }
-
-    @EventBusSubscriber(modid = MOD_ID, value = Dist.CLIENT /^? if <= 1.21.5 {^/ /^, bus = EventBusSubscriber.Bus.MOD ^//^?}^/)
-    public static class MidnightLibBusEvents {
-        //? if >= 1.21.5 {
-        @SubscribeEvent
-        public static void onResourceReload(AddClientReloadListenersEvent event) {
-            event.addListener(ResourceLocation.fromNamespaceAndPath(MOD_ID, "splash_screen"), PuzzleSplashScreen.ReloadListener.INSTANCE);
-        }
-        //?} else {
-        /^@SubscribeEvent
-        public static void onResourceReload(RegisterClientReloadListenersEvent event) {
-            event.registerReloadListener(PuzzleSplashScreen.ReloadListener.INSTANCE);
-        }
-        ^///?}
-    }
- }
-    *///?}
--- a/src/main/java/net/puzzlemc/core/PuzzleCore.java
+++ b/src/main/java/net/puzzlemc/core/PuzzleCore.java
@@ -1,18 +0,0 @@
-package net.puzzlemc.core;
-
-import net.puzzlemc.core.config.PuzzleConfig;
-import net.puzzlemc.gui.PuzzleGui;
-import net.puzzlemc.splashscreen.PuzzleSplashScreen;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class PuzzleCore {
-    public final static String MOD_ID = "puzzle";
-    public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
-
-    public static void initModules() {
-        PuzzleConfig.init(MOD_ID, PuzzleConfig.class);
-        PuzzleGui.init();
-        PuzzleSplashScreen.init();
-    }
-}
--- a/src/main/java/net/puzzlemc/core/config/PuzzleConfig.java
+++ b/src/main/java/net/puzzlemc/core/config/PuzzleConfig.java
@@ -1,28 +0,0 @@
-package net.puzzlemc.core.config;
-
-import eu.midnightdust.lib.config.MidnightConfig;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PuzzleConfig extends MidnightConfig {
-    private static final String GUI = "gui";
-    private static final String INTERNAL = "internal";
-    private static final String FEATURES = "features";
-
-    @Entry(category = GUI, name = "Disabled integrations") public static List<String> disabledIntegrations = new ArrayList<>();
-    @Entry(category = GUI, name = "Enable Puzzle button") public static boolean enablePuzzleButton = true;
-
-    @Entry(category = FEATURES, name = "puzzle.option.resourcepack_splash_screen") public static boolean resourcepackSplashScreen = true;
-    @Entry(category = FEATURES, name = "puzzle.option.unlimited_model_rotations") public static boolean unlimitedRotations = true;
-    @Entry(category = FEATURES, name = "puzzle.option.bigger_custom_models") public static boolean biggerModels = true;
-
-    @Entry(category = INTERNAL, name = "Enable debug messages") public static boolean debugMessages = false;
-    @Entry(category = INTERNAL, name = "Has custom splash screen") public static boolean hasCustomSplashScreen = false;
-    @Entry(category = INTERNAL, name = "Splash Background Color") public static int backgroundColor = 15675965;
-    @Entry(category = INTERNAL, name = "Splash Progress Bar Color") public static int progressBarColor = 16777215;
-    @Entry(category = INTERNAL, name = "Splash Progress Bar Background Color") public static int progressBarBackgroundColor = 15675965;
-    @Entry(category = INTERNAL, name = "Splash Progress Bar Frame Color") public static int progressFrameColor = 16777215;
-    @Entry(category = INTERNAL, name = "puzzle.option.better_splash_screen_blend") public static boolean disableBlend = false;
-    @Entry(category = INTERNAL, name = "Custom Blend Function") public static List<String> customBlendFunction = new ArrayList<>();
-}
--- a/src/main/java/net/puzzlemc/gui/PuzzleGui.java
+++ b/src/main/java/net/puzzlemc/gui/PuzzleGui.java
@@ -1,67 +0,0 @@
-package net.puzzlemc.gui;
-
-import eu.midnightdust.core.MidnightLib;
-import eu.midnightdust.lib.util.PlatformFunctions;
-import net.minecraft.ChatFormatting;
-import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
-import net.puzzlemc.core.config.PuzzleConfig;
-import net.puzzlemc.gui.compat.*;
-import net.puzzlemc.gui.screen.widget.PuzzleWidget;
-import net.minecraft.client.Minecraft;
-import net.puzzlemc.splashscreen.PuzzleSplashScreen;
-
-import static net.puzzlemc.core.PuzzleCore.LOGGER;
-import static net.puzzlemc.core.PuzzleCore.MOD_ID;
-
-public class PuzzleGui {
-    public static final Component YES = Component.translatable("gui.yes").withStyle(ChatFormatting.GREEN);
-    public static final Component NO = Component.translatable("gui.no").withStyle(ChatFormatting.RED);
-    public static final ResourceLocation PUZZLE_BUTTON = ResourceLocation.fromNamespaceAndPath(MOD_ID, "icon/button");
-
-    public static void init() {
-        MidnightLib.hiddenMods.add(MOD_ID);
-        PuzzleApi.addToMiscOptions(new PuzzleWidget(Component.literal("\uD83E\uDDE9 Puzzle")));
-        PuzzleApi.addToMiscOptions(new PuzzleWidget(Component.translatable("puzzle.midnightconfig.title"), (button) -> button.setMessage(Component.literal("OPEN")), (button) -> {
-            Minecraft.getInstance().setScreen(PuzzleConfig.getScreen(Minecraft.getInstance().screen, MOD_ID));
-        }));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.literal("\uD83E\uDDE9 Puzzle")));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("puzzle.option.resourcepack_splash_screen"), (button) -> button.setMessage(PuzzleConfig.resourcepackSplashScreen ? YES : NO), (button) -> {
-            PuzzleConfig.resourcepackSplashScreen = !PuzzleConfig.resourcepackSplashScreen;
-            PuzzleSplashScreen.resetColors();
-            PuzzleConfig.write(MOD_ID);
-            Minecraft.getInstance().getTextureManager()./*? if >= 1.21.5 {*/ registerAndLoad /*?} else {*//*register*//*?}*/(PuzzleSplashScreen.LOGO, new PuzzleSplashScreen.LogoTexture(PuzzleSplashScreen.LOGO));
-        }));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("puzzle.option.unlimited_model_rotations"), (button) -> button.setMessage(PuzzleConfig.unlimitedRotations ? YES : NO), (button) -> {
-            PuzzleConfig.unlimitedRotations = !PuzzleConfig.unlimitedRotations;
-            PuzzleConfig.write(MOD_ID);
-        }));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("puzzle.option.bigger_custom_models"), (button) -> button.setMessage(PuzzleConfig.biggerModels ? YES : NO), (button) -> {
-            PuzzleConfig.biggerModels = !PuzzleConfig.biggerModels;
-            PuzzleConfig.write(MOD_ID);
-        }));
-        if (isActive("cullleaves")) CullLeavesCompat.init();
-        if (isActive("colormatic")) ColormaticCompat.init();
-        if (isActive("borderlessmining")) BorderlessMiningCompat.init();
-        if (isActive("iris")) IrisCompat.init();
-    }
-
-    public static boolean lateInitDone = false;
-    public static void lateInit() { // Some mods are initialized after Puzzle, so we can't access them in our ClientModInitializer
-        if (isActive("lambdynlights")) LDLCompat.init();
-        if (isActive("citresewn")) CITRCompat.init();
-        if (isActive("lambdabettergrass")) LBGCompat.init();
-        if (isActive("continuity")) ContinuityCompat.init();
-        try {
-            if (isActive("entity_texture_features")) ETFCompat.init();
-            if (isActive("entity_model_features")) EMFCompat.init();
-        } catch (Exception e) {
-            LOGGER.error("ETF/EMF config structure changed. Again...", e);
-        }
-
-        lateInitDone = true;
-    }
-    public static boolean isActive(String modid) {
-        return PlatformFunctions.isModLoaded(modid) && !PuzzleConfig.disabledIntegrations.contains(modid);
-    }
-}
--- a/src/main/java/net/puzzlemc/gui/compat/BorderlessMiningCompat.java
+++ b/src/main/java/net/puzzlemc/gui/compat/BorderlessMiningCompat.java
@@ -1,28 +0,0 @@
-package net.puzzlemc.gui.compat;
-
-import com.mojang.text2speech.OperatingSystem;
-import link.infra.borderlessmining.config.ConfigHandler;
-import net.minecraft.network.chat.Component;
-import net.puzzlemc.gui.PuzzleApi;
-import net.puzzlemc.gui.screen.widget.PuzzleWidget;
-
-import static net.puzzlemc.gui.PuzzleGui.NO;
-import static net.puzzlemc.gui.PuzzleGui.YES;
-
-public class BorderlessMiningCompat {
-    public static void init() {
-        PuzzleApi.addToMiscOptions(new PuzzleWidget(Component.literal("\uD83E\uDE9F Borderless Mining")));
-        ConfigHandler bmConfig = ConfigHandler.getInstance();
-        PuzzleApi.addToMiscOptions(new PuzzleWidget(Component.translatable("config.borderlessmining.general.enabled"), (button) -> button.setMessage(bmConfig.isEnabledOrPending() ? YES : NO), (button) -> {
-            bmConfig.setEnabledPending(!bmConfig.isEnabledOrPending());
-            bmConfig.save();
-        }));
-        if (OperatingSystem.get() == OperatingSystem.MAC_OS) {
-            PuzzleApi.addToMiscOptions(new PuzzleWidget(Component.translatable("config.borderlessmining.general.enabledmac"), (button) -> button.setMessage(bmConfig.enableMacOS ? YES : NO), (button) -> {
-                bmConfig.enableMacOS = !bmConfig.enableMacOS;
-                bmConfig.setEnabledPending(bmConfig.isEnabled());
-                bmConfig.save();
-            }));
-        }
-    }
-}
--- a/src/main/java/net/puzzlemc/gui/compat/CITRCompat.java
+++ b/src/main/java/net/puzzlemc/gui/compat/CITRCompat.java
@@ -1,60 +0,0 @@
-package net.puzzlemc.gui.compat;
-
-import net.minecraft.ChatFormatting;
-import net.minecraft.client.Minecraft;
-import net.minecraft.network.chat.Component;
-import net.puzzlemc.gui.PuzzleApi;
-import net.puzzlemc.gui.screen.widget.PuzzleWidget;
-import shcm.shsupercm.fabric.citresewn.config.CITResewnConfig;
-
-import static net.minecraft.network.chat.CommonComponents.GUI_NO;
-import static net.minecraft.network.chat.CommonComponents.GUI_YES;
-
-public class CITRCompat {
-    public static void init() {
-        if (CITResewnConfig.INSTANCE != null) {
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.literal("⛏ CIT Resewn")));
-            CITResewnConfig citConfig = CITResewnConfig.INSTANCE;
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("config.citresewn.enabled.title"), (button) -> button.setMessage(citConfig.enabled ? GUI_YES : GUI_NO), (button) -> {
-                citConfig.enabled = !citConfig.enabled;
-                citConfig.write();
-                Minecraft.getInstance().reloadResourcePacks();
-            }));
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("config.citresewn.mute_errors.title"), (button) -> button.setMessage(citConfig.mute_errors ? GUI_YES : GUI_NO), (button) -> {
-                citConfig.mute_errors = !citConfig.mute_errors;
-                citConfig.write();
-            }));
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("config.citresewn.mute_warns.title"), (button) -> button.setMessage(citConfig.mute_warns ? GUI_YES : GUI_NO), (button) -> {
-                citConfig.mute_warns = !citConfig.mute_warns;
-                citConfig.write();
-            }));
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("config.citresewn.broken_paths.title"), (button) -> button.setMessage(citConfig.broken_paths ? GUI_YES : GUI_NO), (button) -> {
-                citConfig.broken_paths = !citConfig.broken_paths;
-                citConfig.write();
-            }));
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(0, 100, Component.translatable("config.citresewn.cache_ms.title"), () -> citConfig.cache_ms,
-                    (button) -> button.setMessage(message(citConfig)),
-                    (slider) -> {
-                        try {
-                            citConfig.cache_ms = slider.getInt();
-                        } catch (NumberFormatException ignored) {
-                        }
-                        citConfig.write();
-                    }));
-        }
-    }
-    public static Component message(CITResewnConfig config) {
-        int ticks = config.cache_ms;
-        if (ticks <= 1) {
-            return (Component.translatable("config.citresewn.cache_ms.ticks." + ticks)).withStyle(ChatFormatting.AQUA);
-        } else {
-            ChatFormatting color = ChatFormatting.DARK_RED;
-            if (ticks <= 40) color = ChatFormatting.RED;
-            if (ticks <= 20) color = ChatFormatting.GOLD;
-            if (ticks <= 10) color = ChatFormatting.DARK_GREEN;
-            if (ticks <= 5) color = ChatFormatting.GREEN;
-
-            return (Component.translatable("config.citresewn.cache_ms.ticks.any", ticks)).withStyle(color);
-        }
-    }
-}
--- a/src/main/java/net/puzzlemc/gui/compat/ColormaticCompat.java
+++ b/src/main/java/net/puzzlemc/gui/compat/ColormaticCompat.java
@@ -1,48 +0,0 @@
-package net.puzzlemc.gui.compat;
-
-import io.github.kvverti.colormatic.Colormatic;
-import io.github.kvverti.colormatic.ColormaticConfig;
-import io.github.kvverti.colormatic.ColormaticConfigController;
-import net.minecraft.network.chat.Component;
-import net.puzzlemc.gui.PuzzleApi;
-import net.puzzlemc.gui.screen.widget.PuzzleWidget;
-
-import static net.puzzlemc.gui.PuzzleGui.NO;
-import static net.puzzlemc.gui.PuzzleGui.YES;
-
-public class ColormaticCompat {
-    public static void init() {
-        //? if fabric {
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.literal("\uD83C\uDF08 Colormatic")));
-        ColormaticConfig colormaticConfig = Colormatic.config();
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("colormatic.config.option.clearSky"), (button) -> button.setMessage(colormaticConfig.clearSky ? YES : NO), (button) -> {
-            colormaticConfig.clearSky = !colormaticConfig.clearSky;
-            ColormaticConfigController.persist(colormaticConfig);
-        }));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("colormatic.config.option.clearVoid"), (button) -> button.setMessage(colormaticConfig.clearVoid ? YES : NO), (button) -> {
-            colormaticConfig.clearVoid = !colormaticConfig.clearVoid;
-            ColormaticConfigController.persist(colormaticConfig);
-        }));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("colormatic.config.option.blendSkyLight"), (button) -> button.setMessage(colormaticConfig.blendSkyLight ? YES : NO), (button) -> {
-            colormaticConfig.blendSkyLight = !colormaticConfig.blendSkyLight;
-            ColormaticConfigController.persist(colormaticConfig);
-        }));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("colormatic.config.option.flickerBlockLight"), (button) -> button.setMessage(colormaticConfig.flickerBlockLight ? YES : NO), (button) -> {
-            colormaticConfig.flickerBlockLight = !colormaticConfig.flickerBlockLight;
-            ColormaticConfigController.persist(colormaticConfig);
-        }));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(0, 100, Component.translatable("colormatic.config.option.relativeBlockLightIntensity"),
-                () -> (int) (100*(1.0 - colormaticConfig.relativeBlockLightIntensityExponent / -16.0)),
-                (button) -> button.setMessage(Component.translatable("colormatic.config.option.relativeBlockLightIntensity")
-                        .append(": ")
-                        .append(Component.literal(String.valueOf((int)(100 * Math.exp(ColormaticConfig.scaled(colormaticConfig.relativeBlockLightIntensityExponent))))).append("%"))),
-                (slider) -> {
-                    try {
-                        colormaticConfig.relativeBlockLightIntensityExponent = ((1.00 - ((slider.getInt())/100f)) * -16.0);
-                        ColormaticConfigController.persist(colormaticConfig);
-                    }
-                    catch (NumberFormatException ignored) {}
-                }));
-        //?}
-    }
-}
--- a/src/main/java/net/puzzlemc/gui/compat/ContinuityCompat.java
+++ b/src/main/java/net/puzzlemc/gui/compat/ContinuityCompat.java
@@ -1,27 +0,0 @@
-package net.puzzlemc.gui.compat;
-
-import me.pepperbell.continuity.client.config.ContinuityConfig;
-import me.pepperbell.continuity.client.config.Option;
-import net.minecraft.network.chat.Component;
-import net.puzzlemc.gui.PuzzleApi;
-import net.puzzlemc.gui.screen.widget.PuzzleWidget;
-
-import static net.puzzlemc.gui.PuzzleGui.NO;
-import static net.puzzlemc.gui.PuzzleGui.YES;
-
-public class ContinuityCompat {
-    public static void init() {
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.literal("▒ Continuity")));
-        ContinuityConfig contConfig = ContinuityConfig.INSTANCE;
-        contConfig.getOptionMapView().forEach((s, option) -> {
-            if (s.equals("use_manual_culling")) return;
-            try {
-                Option.BooleanOption booleanOption = ((Option.BooleanOption)option);
-                PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("options.continuity."+s), (button) -> button.setMessage(booleanOption.get() ? YES : NO), (button) -> {
-                    booleanOption.set(!booleanOption.get());
-                    contConfig.save();
-                }));
-            } catch (Exception ignored) {}
-        });
-    }
-}
--- a/src/main/java/net/puzzlemc/gui/compat/CullLeavesCompat.java
+++ b/src/main/java/net/puzzlemc/gui/compat/CullLeavesCompat.java
@@ -1,21 +0,0 @@
-package net.puzzlemc.gui.compat;
-
-import eu.midnightdust.cullleaves.config.CullLeavesConfig;
-import net.minecraft.client.Minecraft;
-import net.minecraft.network.chat.Component;
-import net.puzzlemc.gui.PuzzleApi;
-import net.puzzlemc.gui.screen.widget.PuzzleWidget;
-
-import static net.puzzlemc.gui.PuzzleGui.NO;
-import static net.puzzlemc.gui.PuzzleGui.YES;
-
-public class CullLeavesCompat {
-    public static void init() {
-        PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Component.literal("\uD83C\uDF43 Cull Leaves")));
-        PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Component.translatable("cullleaves.puzzle.option.enabled"), (button) -> button.setMessage(CullLeavesConfig.enabled ? YES : NO), (button) -> {
-            CullLeavesConfig.enabled = !CullLeavesConfig.enabled;
-            CullLeavesConfig.write("cullleaves");
-            Minecraft.getInstance().levelRenderer.needsUpdate();
-        }));
-    }
-}
--- a/src/main/java/net/puzzlemc/gui/compat/EMFCompat.java
+++ b/src/main/java/net/puzzlemc/gui/compat/EMFCompat.java
@@ -1,54 +0,0 @@
-package net.puzzlemc.gui.compat;
-
-import net.minecraft.ChatFormatting;
-import net.minecraft.client.Minecraft;
-import net.minecraft.network.chat.CommonComponents;
-import net.minecraft.network.chat.Component;
-import net.puzzlemc.gui.PuzzleApi;
-import net.puzzlemc.gui.screen.widget.PuzzleWidget;
-import traben.entity_model_features.EMF;
-import traben.entity_model_features.config.EMFConfig;
-import traben.entity_texture_features.config.ETFConfig;
-import traben.entity_texture_features.config.screens.ETFConfigScreenMain;
-
-import java.util.EnumSet;
-import java.util.NavigableSet;
-import java.util.Objects;
-import java.util.TreeSet;
-
-import static net.puzzlemc.gui.PuzzleGui.NO;
-import static net.puzzlemc.gui.PuzzleGui.YES;
-
-public class EMFCompat {
-    public static void init() {
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.literal("\uD83D\uDC37 ").append(Component.translatable("entity_model_features.title"))));
-        EMFConfig emfConfig = EMF.config().getConfig();
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("entity_model_features.config.update"), (button) -> button.setMessage(Component.literal(emfConfig.modelUpdateFrequency.toString())), (button) -> {
-            final NavigableSet<ETFConfig.UpdateFrequency> set = new TreeSet<>(EnumSet.allOf(ETFConfig.UpdateFrequency.class));
-            emfConfig.modelUpdateFrequency = Objects.requireNonNullElseGet(set.higher(emfConfig.modelUpdateFrequency), set::first);
-            EMF.config().saveToFile();
-        }));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(0, 65, Component.translatable("entity_model_features.config.lod"), () -> emfConfig.animationLODDistance,
-                (button) -> button.setMessage(lodMessage(emfConfig.animationLODDistance)),
-                (slider) -> {
-                    try {
-                        emfConfig.animationLODDistance = slider.getInt();
-                    } catch (NumberFormatException ignored) {}
-                    EMF.config().saveToFile();
-                }));
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Component.translatable("entity_model_features.config.low_fps_lod"), (button) -> button.setMessage(emfConfig.retainDetailOnLowFps ? YES : NO), (button) -> {
-            emfConfig.retainDetailOnLowFps = !emfConfig.retainDetailOnLowFps;
-            EMF.config().saveToFile();
-        }));
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Component.translatable("entity_model_features.config.large_mob_lod"), (button) -> button.setMessage(emfConfig.retainDetailOnLargerMobs ? YES : NO), (button) -> {
-            emfConfig.retainDetailOnLargerMobs = !emfConfig.retainDetailOnLargerMobs;
-            EMF.config().saveToFile();
-        }));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("puzzle.action.open_config_screen"), (button) -> button.setMessage(Component.nullToEmpty("OPEN")), button -> Minecraft.getInstance().setScreen(new ETFConfigScreenMain(Minecraft.getInstance().screen))));
-    }
-    public static Component lodMessage(int value) {
-        if (value == 20) return Component.literal(value + " (Default)");
-        else if (value == 0 || value == 65) return CommonComponents.OPTION_OFF.copy().withStyle(ChatFormatting.RED);
-        else return Component.literal(String.valueOf(value)).withStyle(ChatFormatting.AQUA);
-    }
-}
--- a/src/main/java/net/puzzlemc/gui/compat/ETFCompat.java
+++ b/src/main/java/net/puzzlemc/gui/compat/ETFCompat.java
@@ -1,50 +0,0 @@
-package net.puzzlemc.gui.compat;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.network.chat.Component;
-import net.puzzlemc.gui.PuzzleApi;
-import net.puzzlemc.gui.screen.widget.PuzzleWidget;
-import traben.entity_texture_features.ETFApi;
-import traben.entity_texture_features.config.ETFConfig;
-import traben.entity_texture_features.config.screens.ETFConfigScreenMain;
-
-import java.util.EnumSet;
-import java.util.NavigableSet;
-import java.util.Objects;
-import java.util.TreeSet;
-
-import static net.puzzlemc.gui.PuzzleGui.NO;
-import static net.puzzlemc.gui.PuzzleGui.YES;
-
-public class ETFCompat {
-    public static void init() {
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.literal("\uD83D\uDC2E ").append(Component.translatable("config.entity_texture_features.title"))));
-        ETFConfig etfConfig = ETFApi.getETFConfigObject();
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("config.entity_texture_features.enable_custom_textures.title"), (button) -> button.setMessage(etfConfig.enableCustomTextures ? YES : NO), (button) -> {
-            etfConfig.enableCustomTextures = !etfConfig.enableCustomTextures;
-            ETFApi.saveETFConfigChangesAndResetETF();
-        }));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("config.entity_texture_features.enable_emissive_textures.title"), (button) -> button.setMessage(etfConfig.enableEmissiveTextures ? YES : NO), (button) -> {
-            etfConfig.enableEmissiveTextures = !etfConfig.enableEmissiveTextures;
-            ETFApi.saveETFConfigChangesAndResetETF();
-        }));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("config.entity_texture_features.emissive_mode.title"), (button) -> button.setMessage(
-                Component.literal(etfConfig.emissiveRenderMode.toString())), (button) -> {
-            final NavigableSet<ETFConfig.EmissiveRenderModes> set =
-                    new TreeSet<>(EnumSet.allOf(ETFConfig.EmissiveRenderModes.class));
-
-            etfConfig.emissiveRenderMode = Objects.requireNonNullElseGet(
-                    set.higher(etfConfig.emissiveRenderMode), set::first);
-            ETFApi.saveETFConfigChangesAndResetETF();
-        }));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("config.entity_texture_features.blinking_mob_settings.title"), (button) -> button.setMessage(etfConfig.enableBlinking ? YES : NO), (button) -> {
-            etfConfig.enableBlinking = !etfConfig.enableBlinking;
-            ETFApi.saveETFConfigChangesAndResetETF();
-        }));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("config.entity_texture_features.player_skin_features.title"), (button) -> button.setMessage(etfConfig.skinFeaturesEnabled ? YES : NO), (button) -> {
-            etfConfig.skinFeaturesEnabled = !etfConfig.skinFeaturesEnabled;
-            ETFApi.saveETFConfigChangesAndResetETF();
-        }));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("puzzle.action.open_config_screen"), (button) -> button.setMessage(Component.nullToEmpty("OPEN")), button -> Minecraft.getInstance().setScreen(new ETFConfigScreenMain(Minecraft.getInstance().screen))));
-    }
-}
--- a/src/main/java/net/puzzlemc/gui/compat/IrisCompat.java
+++ b/src/main/java/net/puzzlemc/gui/compat/IrisCompat.java
@@ -1,25 +0,0 @@
-package net.puzzlemc.gui.compat;
-
-import net.irisshaders.iris.api.v0.IrisApi;
-import net.irisshaders.iris.api.v0.IrisApiConfig;
-import net.minecraft.ChatFormatting;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.network.chat.Component;
-import net.puzzlemc.gui.PuzzleApi;
-import net.puzzlemc.gui.PuzzleGui;
-import net.puzzlemc.gui.screen.widget.PuzzleWidget;
-
-public class IrisCompat {
-    public static void init() {
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Component.literal("\uD83D\uDC41 Iris")));
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Component.translatable("iris.puzzle.option.enableShaders"), (button) -> button.setMessage(IrisApi.getInstance().getConfig().areShadersEnabled() ? PuzzleGui.YES : PuzzleGui.NO), (button) -> {
-            IrisApiConfig irisConfig = IrisApi.getInstance().getConfig();
-            irisConfig.setShadersEnabledAndApply(!irisConfig.areShadersEnabled());
-        }));
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Component.translatable("options.iris.shaderPackSelection.title"), (button) -> button.setMessage(Component.literal("➥ ").append(Component.translatable("iris.puzzle.option.open").withStyle(ChatFormatting.GOLD))), (button) -> {
-            Minecraft client = Minecraft.getInstance();
-            client.setScreen((Screen) IrisApi.getInstance().openMainIrisScreenObj(client.screen));
-        }));
-    }
-}
--- a/src/main/java/net/puzzlemc/gui/compat/LBGCompat.java
+++ b/src/main/java/net/puzzlemc/gui/compat/LBGCompat.java
@@ -1,21 +0,0 @@
-package net.puzzlemc.gui.compat;
-
-import dev.lambdaurora.lambdabettergrass.LBGConfig;
-import dev.lambdaurora.lambdabettergrass.LambdaBetterGrass;
-import net.minecraft.network.chat.Component;
-import net.puzzlemc.gui.PuzzleApi;
-import net.puzzlemc.gui.screen.widget.PuzzleWidget;
-
-import static net.puzzlemc.gui.PuzzleGui.NO;
-import static net.puzzlemc.gui.PuzzleGui.YES;
-
-public class LBGCompat {
-    public static void init() {
-        //? fabric {
-        LBGConfig lbgConfig = LambdaBetterGrass.get().config;
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Component.literal("\uD83C\uDF31 LambdaBetterGrass")));
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Component.translatable("lambdabettergrass.option.mode"), (button) -> button.setMessage(lbgConfig.getMode().getTranslatedText()), (button) -> lbgConfig.setMode(lbgConfig.getMode().next())));
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Component.translatable("lambdabettergrass.option.better_snow"), (button) -> button.setMessage(lbgConfig.hasBetterLayer() ? YES : NO), (button) -> lbgConfig.setBetterLayer(!lbgConfig.hasBetterLayer())));
-        //?}
-    }
-}
--- a/src/main/java/net/puzzlemc/gui/compat/LDLCompat.java
+++ b/src/main/java/net/puzzlemc/gui/compat/LDLCompat.java
@@ -1,23 +0,0 @@
-package net.puzzlemc.gui.compat;
-
-import dev.lambdaurora.lambdynlights.DynamicLightsConfig;
-import dev.lambdaurora.lambdynlights.LambDynLights;
-import net.minecraft.network.chat.Component;
-import net.puzzlemc.gui.PuzzleApi;
-import net.puzzlemc.gui.screen.widget.PuzzleWidget;
-
-import static net.puzzlemc.gui.PuzzleGui.NO;
-import static net.puzzlemc.gui.PuzzleGui.YES;
-
-public class LDLCompat {
-    public static void init() {
-        DynamicLightsConfig ldlConfig = LambDynLights.get().config;
-
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Component.literal("\uD83D\uDCA1 LambDynamicLights")));
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Component.translatable("lambdynlights.option.mode"), (button) -> button.setMessage(ldlConfig.getDynamicLightsMode().getTranslatedText()), (button) -> ldlConfig.setDynamicLightsMode(ldlConfig.getDynamicLightsMode().next())));
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Component.empty().append("DynLights: ").append(Component.translatable("lambdynlights.option.light_sources.entities")), (button) -> button.setMessage(ldlConfig.getEntitiesLightSource().get() ? YES : NO), (button) -> ldlConfig.getEntitiesLightSource().set(!ldlConfig.getEntitiesLightSource().get())));
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Component.empty().append("DynLights: ").append(Component.translatable("entity.minecraft.creeper")), (button) -> button.setMessage(ldlConfig.getCreeperLightingMode().getTranslatedText()), (button) -> ldlConfig.setCreeperLightingMode(ldlConfig.getCreeperLightingMode().next())));
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Component.empty().append("DynLights: ").append(Component.translatable("block.minecraft.tnt")), (button) -> button.setMessage(ldlConfig.getTntLightingMode().getTranslatedText()), (button) -> ldlConfig.setTntLightingMode(ldlConfig.getTntLightingMode().next())));
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Component.empty().append("DynLights: ").append(Component.translatable("lambdynlights.option.light_sources.water_sensitive_check")), (button) -> button.setMessage(ldlConfig.getWaterSensitiveCheck().get() ? YES : NO), (button) -> ldlConfig.getWaterSensitiveCheck().set(!ldlConfig.getWaterSensitiveCheck().get())));
-    }
-}
--- a/src/main/java/net/puzzlemc/gui/mixin/MixinOptionsScreen.java
+++ b/src/main/java/net/puzzlemc/gui/mixin/MixinOptionsScreen.java
@@ -1,86 +0,0 @@
-package net.puzzlemc.gui.mixin;
-
-import eu.midnightdust.core.config.MidnightLibConfig;
-import eu.midnightdust.lib.util.PlatformFunctions;
-
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.network.chat.Component;
-
-import net.puzzlemc.core.config.PuzzleConfig;
-import net.puzzlemc.gui.screen.PuzzleOptionsScreen;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.Objects;
-
-//? if >= 1.21 {
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Shadow;
-import net.minecraft.client.gui.screens.options.OptionsScreen;
-import net.minecraft.client.gui.components.SpriteIconButton;
-import net.minecraft.client.gui.layouts.HeaderAndFooterLayout;
-import net.puzzlemc.gui.PuzzleGui;
-//?} else {
-/*import net.minecraft.client.gui.screens.OptionsScreen;
-import net.minecraft.client.gui.components.TextAndImageButton;
-import net.minecraft.resources.ResourceLocation;
-
-import static net.puzzlemc.core.PuzzleCore.MOD_ID;
-*///?}
-
-@Mixin(OptionsScreen.class)
-public abstract class MixinOptionsScreen extends Screen {
-    private MixinOptionsScreen(Component title) {super(title);}
-
-    //? if >= 1.21 {
-    @Shadow @Final private HeaderAndFooterLayout layout;
-    @Unique
-    SpriteIconButton puzzle$button = SpriteIconButton.builder(Component.translatable("puzzle.screen.title"), (buttonWidget) ->
-                    (Objects.requireNonNull(this.minecraft)).setScreen(new PuzzleOptionsScreen(this)), true)
-            .size(20, 20).sprite(PuzzleGui.PUZZLE_BUTTON, 20, 20).build();
-
-    @Inject(at = @At("HEAD"), method = "init")
-    public void puzzle$onInit(CallbackInfo ci) {
-        if (PuzzleConfig.enablePuzzleButton) {
-            this.puzzle$setButtonPos();
-            this.addRenderableWidget(puzzle$button);
-        }
-    }
-
-    @Inject(at = @At("TAIL"), method = "repositionElements")
-    public void puzzle$onResize(CallbackInfo ci) {
-        if (PuzzleConfig.enablePuzzleButton) this.puzzle$setButtonPos();
-    }
-
-    @Unique
-    public void puzzle$setButtonPos() {
-        int i = 0;
-        if (PlatformFunctions.isModLoaded("lod")) {
-            i = i + 358;
-            if (MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.FALSE)) i = i - 25;
-        }
-        puzzle$button.setPosition(this.width / 2 - 178 + i, layout.getY() + layout.getFooterHeight() - 4);
-    }
-    //?} else {
-    /*@Unique TextAndImageButton puzzle$button = TextAndImageButton.builder(Component.translatable("midnightlib.overview.title"), ResourceLocation.fromNamespaceAndPath(MOD_ID, "icon/button.png"),
-            button -> Objects.requireNonNull(minecraft).setScreen(new PuzzleOptionsScreen(this))).textureSize(19, 19).usedTextureSize(16, 16).offset(-2, 0).build();
-
-    @Inject(at = @At("HEAD"), method = "init")
-    private void midnightlib$init(CallbackInfo ci) {
-        if (PuzzleConfig.enablePuzzleButton) {
-            puzzle$button.setWidth(20);
-            int i = 0;
-            if (PlatformFunctions.isModLoaded("lod")) {
-                i = i + 358;
-                if (MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.FALSE)) i = i - 25;
-            }
-            puzzle$button.setPosition(this.width / 2 - 178 + i, this.height / 6 - 12);
-            this.addRenderableWidget(puzzle$button);
-        }
-    }
-    *///?}
-}
--- a/src/main/java/net/puzzlemc/gui/screen/PuzzleOptionsScreen.java
+++ b/src/main/java/net/puzzlemc/gui/screen/PuzzleOptionsScreen.java
@@ -1,115 +0,0 @@
-package net.puzzlemc.gui.screen;
-
-import com.google.common.collect.Lists;
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.components.tabs.GridLayoutTab;
-import net.minecraft.client.gui.components.tabs.Tab;
-import net.minecraft.client.gui.components.tabs.TabManager;
-import net.minecraft.client.gui.components.tabs.TabNavigationBar;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.network.chat.Component;
-import net.puzzlemc.gui.PuzzleApi;
-import net.puzzlemc.gui.PuzzleGui;
-import net.puzzlemc.gui.screen.widget.*;
-//? if >= 1.21.9
-import net.minecraft.client.input.KeyEvent;
-
-
-import java.util.List;
-import java.util.Objects;
-
-import static net.minecraft.network.chat.CommonComponents.GUI_DONE;
-
-public class PuzzleOptionsScreen extends Screen {
-    public PuzzleOptionListWidget list;
-    public List<Component> tooltip = null;
-    public TabManager tabManager = new TabManager(a -> {}, a -> {});
-    public Tab prevTab;
-    public TabNavigationBar tabNavigation;
-    public static Component graphicsTab = Component.translatable("puzzle.page.graphics");
-    public static Component miscTab = Component.translatable("puzzle.page.misc");
-    public static Component performanceTab = Component.translatable("puzzle.page.performance");
-    public static Component resourcesTab = Component.translatable("puzzle.page.resources");
-
-    public PuzzleOptionsScreen(Screen parent) {
-        super(Component.translatable("puzzle.screen.title"));
-        this.parent = parent;
-    }
-    private final Screen parent;
-
-    @Override
-    protected void init() {
-        if (!PuzzleGui.lateInitDone) PuzzleGui.lateInit();
-
-        List<Tab> tabs = Lists.newArrayList();
-        if (!PuzzleApi.GRAPHICS_OPTIONS.isEmpty()) tabs.add(new GridLayoutTab(graphicsTab));
-        if (!PuzzleApi.RESOURCE_OPTIONS.isEmpty()) tabs.add(new GridLayoutTab(resourcesTab));
-        if (!PuzzleApi.PERFORMANCE_OPTIONS.isEmpty()) tabs.add(new GridLayoutTab(performanceTab));
-        if (!PuzzleApi.MISC_OPTIONS.isEmpty()) tabs.add(new GridLayoutTab(miscTab));
-
-        tabNavigation = TabNavigationBar.builder(tabManager, this.width).addTabs(tabs.toArray(new Tab[0])).build();
-        tabNavigation.selectTab(0, false);
-        tabNavigation.arrangeElements();
-        prevTab = tabManager.getCurrentTab();
-
-        this.list = new PuzzleOptionListWidget(this.minecraft, this.width, this.height - 57, 24, 25);
-        fillList();
-
-        if (tabs.size() > 1) {
-            this.addRenderableWidget(tabNavigation);
-            list.renderHeaderSeparator = false;
-        }
-
-        this.addWidget(list);
-
-        super.init();
-        this.addRenderableWidget(Button.builder(GUI_DONE, (button) -> Objects.requireNonNull(minecraft).setScreen(parent)).bounds(this.width / 2 - 100, this.height - 26, 200, 20).build());
-    }
-    private void fillList() {
-        List<PuzzleWidget> options = List.of();
-        if (tabManager.getCurrentTab() == null) return;
-        else {
-            Component title = tabManager.getCurrentTab().getTabTitle();
-            if (title.equals(graphicsTab)) options = PuzzleApi.GRAPHICS_OPTIONS;
-            else if (title.equals(miscTab)) options = PuzzleApi.MISC_OPTIONS;
-            else if (title.equals(performanceTab))
-                options = PuzzleApi.PERFORMANCE_OPTIONS;
-            else if (title.equals(resourcesTab)) options = PuzzleApi.RESOURCE_OPTIONS;
-        }
-        list.addAll(options);
-    }
-    @Override
-    public void tick() {
-        super.tick();
-        if (prevTab != null && prevTab != tabManager.getCurrentTab()) {
-            prevTab = tabManager.getCurrentTab();
-            this.list.clear();
-            fillList();
-            list.setScrollAmount(0);
-        }
-    }
-
-    @Override
-    //? if >= 1.21.9 {
-    public boolean keyPressed(KeyEvent input) {
-        return this.tabNavigation.keyPressed(input) || super.keyPressed(input);
-    }
-    //?} else {
-    /*public boolean keyPressed(int key, int scanCode, int modifiers) {
-        return this.tabNavigation.keyPressed(key) || super.keyPressed(key, scanCode, modifiers);
-    }
-    *///?}
-
-    @Override
-    public void render(GuiGraphics context, int mouseX, int mouseY, float delta) {
-        //? if >= 1.21 {
-        super.render(context, mouseX, mouseY, delta);
-        //?} else {
-        /*super.renderBackground(context);
-         *///?}
-        this.list.render(context, mouseX, mouseY, delta);
-        //? if < 1.21
-        /*super.render(context, mouseX, mouseY, delta);*/
-    }
-}
--- a/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleButtonWidget.java
+++ b/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleButtonWidget.java
@@ -1,22 +0,0 @@
-package net.puzzlemc.gui.screen.widget;
-
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.network.chat.Component;
-
-import java.util.function.Supplier;
-
-public class PuzzleButtonWidget extends Button {
-    private final PuzzleWidget.TextAction title;
-
-    public PuzzleButtonWidget(int x, int y, int width, int height, PuzzleWidget.TextAction title, OnPress onPress) {
-        super(x, y, width, height, Component.empty(), onPress, Supplier::get);
-        this.title = title;
-    }
-    @Override
-    public void renderWidget(GuiGraphics context, int mouseX, int mouseY, float delta) {
-        try { title.setTitle(this);
-        } catch (Exception e) {e.fillInStackTrace(); this.visible = false;}
-        super.renderWidget(context, mouseX, mouseY, delta);
-    }
-}
--- a/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleOptionListWidget.java
+++ b/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleOptionListWidget.java
@@ -1,98 +0,0 @@
-package net.puzzlemc.gui.screen.widget;
-
-import eu.midnightdust.lib.config.ButtonEntry;
-import eu.midnightdust.lib.config.EntryInfo;
-import eu.midnightdust.lib.config.MidnightConfig;
-import eu.midnightdust.lib.config.MidnightConfigListWidget;
-import net.minecraft.ChatFormatting;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.components.AbstractWidget;
-import net.minecraft.client.resources.language.I18n;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.contents.TranslatableContents;
-import net.puzzlemc.gui.screen.PuzzleOptionsScreen;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-
-import static net.puzzlemc.core.PuzzleCore.LOGGER;
-
-public class PuzzleOptionListWidget extends MidnightConfigListWidget {
-    Font textRenderer;
-
-    public PuzzleOptionListWidget(Minecraft minecraftClient, int i, int j, int k, int l) {
-        super(minecraftClient, i, j, k, l);
-        this.centerListVertically = false;
-        textRenderer = minecraftClient.font;
-    }
-
-    public void addAll(List<PuzzleWidget> buttons) {
-        int buttonX = this.width - 160;
-        for (PuzzleWidget button : buttons) {
-            try {
-                if (button.buttonType == ButtonType.TEXT)
-                    this.addButton(List.of(), Component.literal("").append(button.descriptionText).withStyle(ChatFormatting.BOLD));
-                else if (button.buttonType == ButtonType.BUTTON)
-                    this.addButton(List.of(new PuzzleButtonWidget(buttonX, 0, 150, 20, button.buttonTextAction, button.onPress)), button.descriptionText);
-                else if (button.buttonType == ButtonType.SLIDER)
-                    this.addButton(List.of(new PuzzleSliderWidget(button.min, button.max, buttonX, 0, 150, 20, button.defaultSliderValue.getAsInt(), button.buttonTextAction, button.changeSliderValue)), button.descriptionText);
-                else if (button.buttonType == ButtonType.TEXT_FIELD)
-                    this.addButton(List.of(new PuzzleTextFieldWidget(textRenderer, buttonX, 0, 150, 20, button.setTextValue, button.changeTextValue)), button.descriptionText);
-                else
-                    LOGGER.warn("Button {} is missing the buttonType variable. This shouldn't happen!", button);
-            }
-            catch (Exception e) {
-                LOGGER.error("Failed to add button {}. Likely caused by an update of the specific mod.", button.descriptionText);
-            }
-
-        }
-    }
-    public void addButton(List<AbstractWidget> buttons, Component text) {
-        EntryInfo info = new EntryInfo(null, "puzzle");
-        if (buttons.isEmpty()) info.comment = new MidnightConfig.Comment(){
-            public Class<? extends Annotation> annotationType() {return null;}
-            public boolean centered() {return true;}
-            public String category() {return "";}
-            public String name() {return "";}
-            public String url() {return "";}
-            public String requiredMod() {return "";}
-        };
-        var entry = new ButtonEntry(buttons, text, info);
-        this.addEntry(entry);
-    }
-    public void /*? if >= 1.21 {*/ renderWidget /*?} else {*/ /*renderList *//*?}*/(GuiGraphics context, int mouseX, int mouseY, float delta) {
-        super./*? if >= 1.21 {*/ renderWidget /*?} else {*/ /*renderList *//*?}*/(context, mouseX, mouseY, delta);
-        ButtonEntry e = this.getHovered();
-        if (minecraft.screen instanceof PuzzleOptionsScreen page && e != null && !e.buttons.isEmpty() &&
-                e.text.getContents() instanceof TranslatableContents content) {
-            AbstractWidget button = e.buttons.get(0);
-            String key = null;
-            if (I18n.exists(content.getKey() + ".tooltip")) key = content.getKey() + ".tooltip";
-            else if (I18n.exists(content.getKey() + ".desc")) key = content.getKey() + ".desc";
-            if (key == null && content.getKey().endsWith(".title")) {
-                String strippedContent = content.getKey().substring(0, content.getKey().length()-6);
-                if (I18n.exists(strippedContent + ".tooltip")) key = strippedContent + ".tooltip";
-                else if (I18n.exists(strippedContent + ".desc")) key = strippedContent + ".desc";
-            }
-
-            if (key != null) {
-                List<Component> list = new ArrayList<>();
-                for (String str : I18n.get(key).split("\n"))
-                    list.add(Component.literal(str));
-                page.tooltip = list;
-                if (!button.isMouseOver(mouseX, mouseY)) {
-                    context.setComponentTooltipForNextFrame(textRenderer, list, button.getX(), button.getY() + (button.getHeight() * 2));
-                }
-                else context.setComponentTooltipForNextFrame(textRenderer, list, mouseX, mouseY);
-            }
-        }
-    }
-
-    @Override
-    public ButtonEntry getHovered() {
-        return super.getHovered();
-    }
-}
--- a/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleTextFieldWidget.java
+++ b/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleTextFieldWidget.java
@@ -1,25 +0,0 @@
-package net.puzzlemc.gui.screen.widget;
-
-import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.components.EditBox;
-import net.minecraft.network.chat.Component;
-
-public class PuzzleTextFieldWidget extends EditBox {
-    private final PuzzleWidget.SetTextValueAction setValueAction;
-    private final PuzzleWidget.ChangeTextValueAction change;
-
-    public PuzzleTextFieldWidget(Font font, int x, int y, int width, int height, PuzzleWidget.SetTextValueAction setValue, PuzzleWidget.ChangeTextValueAction change) {
-        super(font, x, y, width, height, Component.empty());
-        this.setValueAction = setValue;
-        this.change = change;
-        try {
-            setValueAction.setTextValue(this);
-        } catch (Exception e) {e.fillInStackTrace(); this.setVisible(false);}
-    }
-    @Override
-    public void setValue(String text) {
-        super.setValue(text);
-        this.change.onChange(this);
-        setValueAction.setTextValue(this);
-    }
-}
--- a/src/main/java/net/puzzlemc/splashscreen/PuzzleSplashScreen.java
+++ b/src/main/java/net/puzzlemc/splashscreen/PuzzleSplashScreen.java
@@ -1,240 +0,0 @@
-package net.puzzlemc.splashscreen;
-
-import com.mojang.blaze3d.pipeline.RenderPipeline;
-import com.mojang.blaze3d.platform.NativeImage;
-import eu.midnightdust.lib.util.MidnightColorUtil;
-import eu.midnightdust.lib.util.PlatformFunctions;
-import net.minecraft.Util;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.texture.DynamicTexture;
-import net.minecraft.client.renderer.texture.ReloadableTexture;
-import net.minecraft.client.resources.metadata.texture.TextureMetadataSection;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.packs.PackType;
-import net.minecraft.server.packs.VanillaPackResources;
-import net.minecraft.server.packs.resources.ResourceManager;
-import net.minecraft.server.packs.resources.ResourceManagerReloadListener;
-import net.puzzlemc.core.config.PuzzleConfig;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-
-//? if >= 1.21.5 {
-import com.mojang.blaze3d.pipeline.BlendFunction;
-import com.mojang.blaze3d.platform.DepthTestFunction;
-import com.mojang.blaze3d.platform.DestFactor;
-import com.mojang.blaze3d.platform.SourceFactor;
-import net.minecraft.client.renderer.texture.TextureContents;
-import net.puzzlemc.splashscreen.mixin.RenderPipelinesAccessor;
-//?}
-
-//? if = 1.21.5 {
-/*import net.minecraft.client.gui.screens.LoadingOverlay;
-import net.minecraft.client.renderer.RenderStateShard;
-import net.minecraft.client.renderer.RenderType;
-import net.minecraft.util.TriState;
-*///?}
-
-import static net.puzzlemc.core.PuzzleCore.LOGGER;
-import static net.puzzlemc.core.PuzzleCore.MOD_ID;
-
-public class PuzzleSplashScreen {
-    public static final ResourceLocation LOGO = ResourceLocation.fromNamespaceAndPath("minecraft", "textures/gui/title/mojangstudios.png");
-    public static final ResourceLocation BACKGROUND = ResourceLocation.fromNamespaceAndPath("minecraft", "puzzle/splash_background.png");
-    public static File CONFIG_PATH = new File(String.valueOf(PlatformFunctions.getConfigDirectory().resolve(".puzzle_cache")));
-    public static Path LOGO_TEXTURE = Paths.get(CONFIG_PATH + "/mojangstudios.png");
-    public static Path BACKGROUND_TEXTURE = Paths.get(CONFIG_PATH + "/splash_background.png");
-    private static Minecraft client = Minecraft.getInstance();
-    private static boolean keepBackground = false;
-    public static RenderPipeline CUSTOM_LOGO_PIPELINE;
-    //? if = 1.21.5
-    /*public static RenderType CUSTOM_LOGO_LAYER;*/
-
-    public static void init() {
-        if (!CONFIG_PATH.exists()) { // Run when config directory is nonexistent //
-            if (CONFIG_PATH.mkdir()) { // Create our custom config directory //
-                if (Util.getPlatform().equals(Util.OS.WINDOWS)) {
-                    try { Files.setAttribute(CONFIG_PATH.toPath(), "dos:hidden", true);
-                    } catch (IOException ignored) {}
-                }
-            }
-        }
-        //? if >= 1.21.5
-        buildRenderLayer();
-    }
-
-    //? if >= 1.21.5 {
-    public static void buildRenderLayer() {
-        if (PuzzleConfig.resourcepackSplashScreen) {
-            BlendFunction blendFunction = new BlendFunction(SourceFactor.SRC_ALPHA, DestFactor.ONE);
-            if (PuzzleConfig.disableBlend) blendFunction = null;
-            else if (PuzzleConfig.customBlendFunction.size() == 4) {
-                try {
-                    blendFunction = new BlendFunction(
-                            SourceFactor.valueOf(PuzzleConfig.customBlendFunction.get(0)),
-                            DestFactor.valueOf(PuzzleConfig.customBlendFunction.get(1)),
-                            SourceFactor.valueOf(PuzzleConfig.customBlendFunction.get(2)),
-                            DestFactor.valueOf(PuzzleConfig.customBlendFunction.get(3)));
-                } catch (Exception e) {
-                    LOGGER.error("Incorrect blend function defined in color.properties: {}{}", PuzzleConfig.customBlendFunction, e.getMessage());
-                }
-            }
-
-            var CUSTOM_LOGO_PIPELINE_BUILDER = RenderPipeline.builder(RenderPipelinesAccessor.getGUI_TEXTURED_SNIPPET())
-                .withLocation("pipeline/mojang_logo_puzzle")
-                .withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST)
-                .withDepthWrite(false);
-            CUSTOM_LOGO_PIPELINE_BUILDER = blendFunction != null ? CUSTOM_LOGO_PIPELINE_BUILDER.withBlend(blendFunction) : CUSTOM_LOGO_PIPELINE_BUILDER.withoutBlend();
-
-            CUSTOM_LOGO_PIPELINE = CUSTOM_LOGO_PIPELINE_BUILDER.build();
-
-            //? if <= 1.21.5 {
-            /*CUSTOM_LOGO_LAYER = RenderType.create("mojang_logo_puzzle", 786432, CUSTOM_LOGO_PIPELINE,
-                    RenderType.CompositeState.builder()
-                            .setTextureState(new RenderStateShard.TextureStateShard(LoadingOverlay.MOJANG_STUDIOS_LOGO_LOCATION, TriState.DEFAULT, false))
-                            .createCompositeState(false));
-            *///?}
-        }
-    }
-    //?}
-
-    public static class ReloadListener implements ResourceManagerReloadListener {
-        public static final ReloadListener INSTANCE = new ReloadListener();
-
-        private ReloadListener() {}
-
-        @Override
-        public void onResourceManagerReload(ResourceManager manager) {
-            client = Minecraft.getInstance();
-            if (PuzzleConfig.resourcepackSplashScreen) {
-                PuzzleSplashScreen.resetColors();
-                client.getTextureManager()./*? if >= 1.21.5 {*/ registerAndLoad /*?} else {*//*register*//*?}*/(LOGO, new LogoTexture(LOGO));
-                client.getTextureManager()./*? if >= 1.21.5 {*/ registerAndLoad /*?} else {*//*register*//*?}*/(BACKGROUND, new LogoTexture(BACKGROUND));
-
-                manager.listResources("optifine", path -> path.getPath().contains("color.properties")).forEach((id, resource) -> {
-                    try (InputStream stream = resource.open()) {
-                        Properties properties = new Properties();
-                        properties.load(stream);
-
-                        if (properties.get("screen.loading") != null) {
-                            PuzzleConfig.backgroundColor = MidnightColorUtil.hex2Rgb(properties.get("screen.loading").toString()).getRGB();
-                            PuzzleConfig.hasCustomSplashScreen = true;
-                        }
-                        if (properties.get("screen.loading.bar") != null) {
-                            PuzzleConfig.progressBarBackgroundColor = MidnightColorUtil.hex2Rgb(properties.get("screen.loading.bar").toString()).getRGB();
-                            PuzzleConfig.hasCustomSplashScreen = true;
-                        }
-                        if (properties.get("screen.loading.progress") != null) {
-                            PuzzleConfig.progressBarColor = MidnightColorUtil.hex2Rgb(properties.get("screen.loading.progress").toString()).getRGB();
-                            PuzzleConfig.hasCustomSplashScreen = true;
-                        }
-                        if (properties.get("screen.loading.outline") != null) {
-                            PuzzleConfig.progressFrameColor = MidnightColorUtil.hex2Rgb(properties.get("screen.loading.outline").toString()).getRGB();
-                            PuzzleConfig.hasCustomSplashScreen = true;
-                        }
-                        if (properties.get("screen.loading.blend") != null) {
-                            // Recommended blend: SRC_ALPHA ONE_MINUS_SRC_ALPHA ONE ZERO
-                            PuzzleConfig.disableBlend = properties.get("screen.loading.blend").toString().equals("off");
-                            PuzzleConfig.customBlendFunction = new ArrayList<>(Arrays.stream(properties.get("screen.loading.blend").toString().split(" ")).toList());
-                            PuzzleConfig.hasCustomSplashScreen = true;
-                        }
-
-                    } catch (Exception e) {
-                        LOGGER.error("Error occurred while loading color.properties {}", id.toString(), e);
-                    }
-                });
-                AtomicInteger logoCount = new AtomicInteger();
-                manager.listResources("textures", path -> path.getPath().contains("mojangstudios.png")).forEach((id, resource) -> {
-                    try (InputStream stream = resource.open()) {
-                        Files.copy(stream, LOGO_TEXTURE, StandardCopyOption.REPLACE_EXISTING);
-                        client.getTextureManager()./*? if >= 1.21.5 {*/ registerAndLoad /*?} else {*//*register*//*?}*/(LOGO, new DynamicLogoTexture());
-                        if (logoCount.get() > 0) PuzzleConfig.hasCustomSplashScreen = true;
-                        logoCount.getAndIncrement();
-                    } catch (Exception e) {
-                        LOGGER.error("Error occurred while loading custom minecraft logo {}", id.toString(), e);
-                    }
-                });
-                manager.listResources(MOD_ID, path -> path.getPath().contains("splash_background.png")).forEach((id, resource) -> {
-                    try (InputStream stream = resource.open()) {
-                        Files.copy(stream, BACKGROUND_TEXTURE, StandardCopyOption.REPLACE_EXISTING);
-                        InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.BACKGROUND_TEXTURE));
-                        client.getTextureManager().register(BACKGROUND, new DynamicTexture(/*? if >= 1.21.5 {*/() -> "splash_screen_background",/*?}*/ NativeImage.read(input)));
-                        keepBackground = true;
-                        PuzzleConfig.hasCustomSplashScreen = true;
-                    } catch (Exception e) {
-                        LOGGER.error("Error occurred while loading custom splash background {}", id.toString(), e);
-                    }
-                });
-                if (!keepBackground) {
-                    try {
-                        Files.delete(BACKGROUND_TEXTURE);
-                    } catch (Exception ignored) {}
-                }
-                keepBackground = false;
-                PuzzleConfig.write(MOD_ID);
-                //? if >= 1.21.5
-                buildRenderLayer();
-            }
-        }
-    }
-
-    public static void resetColors() {
-        PuzzleConfig.backgroundColor = 15675965;
-        PuzzleConfig.progressBarColor = 16777215;
-        PuzzleConfig.progressBarBackgroundColor = 15675965;
-        PuzzleConfig.progressFrameColor = 16777215;
-        PuzzleConfig.disableBlend = false;
-        PuzzleConfig.customBlendFunction = new ArrayList<>();
-        PuzzleConfig.hasCustomSplashScreen = false;
-    }
-
-
-    public static class LogoTexture extends ReloadableTexture {
-        public LogoTexture(ResourceLocation logo) {
-            super(logo);
-        }
-
-        @Override
-        public @NotNull TextureContents loadContents(ResourceManager resourceManager) {
-            Minecraft client = Minecraft.getInstance();
-            VanillaPackResources defaultResourcePack = client.getVanillaPackResources();
-            try (InputStream input = Objects.requireNonNull(defaultResourcePack.getResource(PackType.CLIENT_RESOURCES, LOGO)).get()) {
-                return  /*? if >= 1.21.5 {*/ new TextureContents(NativeImage.read(input), new TextureMetadataSection(true, true)) /*?} else {*/ /*new TextureContents(new TextureMetadataSection(true, true), NativeImage.read(input))  *//*?}*/;
-            } catch (IOException ex) {
-                return /*? if >= 1.21.5 {*/ TextureContents.createMissing() /*?} else {*/ /*new TextureContents(ex) *//*?}*/;
-            }
-        }
-    }
-
-    public static class DynamicLogoTexture extends ReloadableTexture {
-        public DynamicLogoTexture() {
-            super(LOGO);
-        }
-        @Override
-        public @NotNull TextureContents loadContents(ResourceManager resourceManager) {
-            try (InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.LOGO_TEXTURE))) {
-                return  /*? if >= 1.21.5 {*/ new TextureContents(NativeImage.read(input), new TextureMetadataSection(true, true)) /*?} else {*/ /*new TextureContents(new TextureMetadataSection(true, true), NativeImage.read(input))  *//*?}*/;
-            } catch (IOException e) {
-                LOGGER.error("Encountered an error during logo loading: ", e);
-                //? if >= 1.21.5 {
-                try {
-                    return TextureContents.load(resourceManager, LOGO);
-                } catch (IOException ex) {
-                    return TextureContents.createMissing();
-                }
-                //?} else {
-                /*return TextureContents.load(resourceManager, LOGO);
-                *///?}
-            }
-        }
-    }
-}
--- a/src/main/java/net/puzzlemc/splashscreen/mixin/MixinNeoForgeLoadingOverlay.java
+++ b/src/main/java/net/puzzlemc/splashscreen/mixin/MixinNeoForgeLoadingOverlay.java
@@ -1,32 +0,0 @@
-package net.puzzlemc.splashscreen.mixin;
-
-//? neoforge {
-/*import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.screens.LoadingOverlay;
-import net.minecraft.server.packs.resources.ReloadInstance;
-import net.neoforged.neoforge.client.loading.NeoForgeLoadingOverlay;
-import net.puzzlemc.core.config.PuzzleConfig;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.Optional;
-import java.util.function.Consumer;
-
-@Mixin(NeoForgeLoadingOverlay.class)
-public class MixinNeoForgeLoadingOverlay extends LoadingOverlay {
-    public MixinNeoForgeLoadingOverlay(Minecraft arg, ReloadInstance arg2, Consumer<Optional<Throwable>> consumer, boolean bl) {
-        super(arg, arg2, consumer, bl);
-    }
-
-    @Inject(method = "render", at = @At("HEAD"), cancellable = true) // Replaces the NeoForge loading screen in later stages with the (customized) vanilla version
-    private void redirectNeoForgeLoading(GuiGraphics context, int mouseX, int mouseY, float tickDelta, CallbackInfo ci) {
-        if (PuzzleConfig.resourcepackSplashScreen && PuzzleConfig.hasCustomSplashScreen) {
-            super.render(context, mouseX, mouseY, tickDelta);
-            ci.cancel();
-        }
-    }
-}
-*///?}
--- a/src/main/java/net/puzzlemc/splashscreen/mixin/MixinSplashScreen.java
+++ b/src/main/java/net/puzzlemc/splashscreen/mixin/MixinSplashScreen.java
@@ -1,168 +0,0 @@
-package net.puzzlemc.splashscreen.mixin;
-
-import com.mojang.blaze3d.platform.NativeImage;
-import net.minecraft.Util;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.screens.LoadingOverlay;
-import net.minecraft.client.gui.screens.Overlay;
-import net.minecraft.client.renderer.texture.DynamicTexture;
-import net.minecraft.client.renderer.texture.TextureManager;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.Mth;
-import net.puzzlemc.core.config.PuzzleConfig;
-import net.puzzlemc.splashscreen.PuzzleSplashScreen;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.*;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.util.function.IntSupplier;
-
-//? if >= 1.21.8 {
-import net.minecraft.util.ARGB;
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import com.mojang.blaze3d.pipeline.RenderPipeline;
-import net.minecraft.client.renderer.RenderPipelines;
-//?} else if >= 1.21.5 {
-/*import net.minecraft.util.ARGB;
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import net.minecraft.client.renderer.RenderType;
-import java.util.function.Function;
-*///?} else {
-/*import com.mojang.blaze3d.platform.GlStateManager;
-import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.client.renderer.GameRenderer;
-
-import static net.puzzlemc.core.PuzzleCore.LOGGER;
-*///?}
-
-import static net.puzzlemc.splashscreen.PuzzleSplashScreen.BACKGROUND;
-//? if >= 1.21.5
-import static net.minecraft.client.gui.screens.LoadingOverlay.MOJANG_STUDIOS_LOGO_LOCATION;
-
-@Mixin(value = LoadingOverlay.class, priority = 2000)
-public abstract class MixinSplashScreen extends Overlay {
-    @Shadow private long fadeInStart;
-    @Shadow @Final private Minecraft minecraft;
-    @Shadow @Final private boolean fadeIn;
-    @Shadow private long fadeOutStart;
-    @Shadow
-    private static int replaceAlpha(int color, int alpha) {
-        return 0;
-    }
-    //? if < 1.21.5
-    /*@Shadow @Final static ResourceLocation MOJANG_STUDIOS_LOGO_LOCATION;*/
-
-    @Inject(method = "registerTextures", at = @At("TAIL")) // Load our custom textures at game start //
-    //? if >= 1.21.5 {
-    private static void puzzle$initSplashscreen(TextureManager textureManager, CallbackInfo ci) {
-    //?} else {
-    /*private static void puzzle$initSplashscreen(Minecraft client, CallbackInfo ci) {
-        TextureManager textureManager = client.getTextureManager();
-        *///?}
-        if (PuzzleConfig.resourcepackSplashScreen) {
-            if (PuzzleSplashScreen.LOGO_TEXTURE.toFile().exists()) {
-                textureManager./*? if >= 1.21.5 {*/ registerAndLoad /*?} else {*//*register*//*?}*/(MOJANG_STUDIOS_LOGO_LOCATION, new PuzzleSplashScreen.DynamicLogoTexture());
-            }
-            if (PuzzleSplashScreen.BACKGROUND_TEXTURE.toFile().exists()) {
-                try {
-                    InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.BACKGROUND_TEXTURE));
-                    textureManager.register(BACKGROUND, new DynamicTexture(/*? if >= 1.21.5 {*/ () -> "splash_screen_background", /*?}*/ NativeImage.read(input)));
-                } catch (IOException ignored) {}
-            }
-        }
-    }
-
-    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Ljava/util/function/IntSupplier;getAsInt()I"))
-    private int puzzle$modifyBackground(IntSupplier instance) { // Set the Progress Bar Frame Color to our configured value //
-        return (!PuzzleConfig.resourcepackSplashScreen || PuzzleConfig.progressBarBackgroundColor == 15675965) ? instance.getAsInt() : PuzzleConfig.backgroundColor | 255 << 24;
-    }
-
-    //? if >= 1.21.8 {
-    @WrapOperation(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;blit(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/ResourceLocation;IIFFIIIIIII)V"))
-    private void puzzle$modifyRenderLayer(GuiGraphics context, RenderPipeline pipeline, ResourceLocation sprite, int x, int y, float u, float v, int width, int height, int regionWidth, int regionHeight, int textureWidth, int textureHeight, int color, Operation<Void> original) {
-        if (PuzzleConfig.resourcepackSplashScreen)
-            context.blit(PuzzleSplashScreen.CUSTOM_LOGO_PIPELINE, sprite, x, y, u, v, width, height, regionWidth, regionHeight, textureWidth, textureHeight, color);
-        else context.blit(pipeline, sprite, x, y, u, v, width, height, textureWidth, textureHeight, color);
-    }
-    //?} else if >= 1.21.5 {
-    /*@WrapOperation(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;blit(Ljava/util/function/Function;Lnet/minecraft/resources/ResourceLocation;IIFFIIIIIII)V"))
-    private void puzzle$modifyRenderLayer(GuiGraphics context, Function<ResourceLocation, RenderType> renderType, ResourceLocation sprite, int x, int y, float u, float v, int width, int height, int regionWidth, int regionHeight, int textureWidth, int textureHeight, int color, Operation<Void> original) {
-        if (PuzzleConfig.resourcepackSplashScreen)
-            context.blit(id -> PuzzleSplashScreen.CUSTOM_LOGO_LAYER, sprite, x, y, u, v, width, height, regionWidth, regionHeight, textureWidth, textureHeight, color);
-        else context.blit(renderType, sprite, x, y, u, v, width, height, textureWidth, textureHeight, color);
-    }
-    *///?} else {
-    /*@Inject(method = "render", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;blendFunc(II)V", shift = At.Shift.AFTER), remap = false)
-    private void puzzle$betterBlend(GuiGraphics context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-        if (PuzzleConfig.resourcepackSplashScreen) {
-            if (PuzzleConfig.disableBlend) RenderSystem.disableBlend();
-            else if (PuzzleConfig.customBlendFunction.size() == 4) {
-                try {
-                    RenderSystem.blendFuncSeparate(
-                            GlStateManager.SourceFactor.valueOf(PuzzleConfig.customBlendFunction.get(0)),
-                            GlStateManager.DestFactor.valueOf(PuzzleConfig.customBlendFunction.get(1)),
-                            GlStateManager.SourceFactor.valueOf(PuzzleConfig.customBlendFunction.get(2)),
-                            GlStateManager.DestFactor.valueOf(PuzzleConfig.customBlendFunction.get(3)));
-                } catch (Exception e) {
-                    LOGGER.error("Incorrect blend function defined in color.properties: {}{}", PuzzleConfig.customBlendFunction, e.getMessage());
-                }
-            }
-        }
-    }
-    *///?}
-
-    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;guiWidth()I", ordinal = 2))
-    private void puzzle$renderSplashBackground(GuiGraphics context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-        if (Files.exists(PuzzleSplashScreen.BACKGROUND_TEXTURE) && PuzzleConfig.resourcepackSplashScreen) {
-            int width = minecraft.getWindow().getGuiScaledWidth();
-            int height = minecraft.getWindow().getGuiScaledHeight();
-            long l = Util.getMillis();
-            float f = this.fadeOutStart > -1L ? (float)(l - this.fadeOutStart) / 1000.0F : -1.0F;
-            float g = this.fadeInStart> -1L ? (float)(l - this.fadeInStart) / 500.0F : -1.0F;
-            float s;
-            if (f >= 1.0F) s = 1.0F - Mth.clamp(f - 1.0F, 0.0F, 1.0F);
-            else if (fadeIn) s = Mth.clamp(g, 0.0F, 1.0F);
-            else s = 1.0F;
-
-            //? if >= 1.21.8 {
-            context.blit(RenderPipelines.GUI_TEXTURED, BACKGROUND, 0, 0, 0, 0, width, height, width, height, ARGB.white(s));
-            //?} else if >= 1.21.5 {
-            /*context.blit(RenderType::guiTextured, BACKGROUND, 0, 0, 0, 0, width, height, width, height, ARGB.white(s));
-            *///?} else {
-            /*RenderSystem.enableBlend();
-            RenderSystem.defaultBlendFunc();
-            RenderSystem.setShader(GameRenderer::getPositionTexShader);
-            RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, s);
-            context.blit(BACKGROUND, 0, 0, 0, 0, width, height, width, height);
-            RenderSystem.disableBlend();
-            *///?}
-        }
-    }
-
-    @Inject(method = "drawProgressBar", at = @At("HEAD"))
-    private void puzzle$addProgressBarBackground(GuiGraphics context, int minX, int minY, int maxX, int maxY, float opacity, CallbackInfo ci) {
-        if (!PuzzleConfig.resourcepackSplashScreen || PuzzleConfig.progressBarBackgroundColor == 15675965) return;
-        long l = Util.getMillis();
-        float f = this.fadeOutStart > -1L ? (float)(l - this.fadeOutStart) / 1000.0F : -1.0F;
-        int m = Mth.ceil((1.0F - Mth.clamp(f - 1.0F, 0.0F, 1.0F)) * 255.0F);
-        context.fill(minX, minY, maxX, maxY, replaceAlpha(PuzzleConfig.progressBarBackgroundColor, m));
-    }
-
-    @ModifyArg(method = "drawProgressBar", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;fill(IIIII)V"), index = 4)
-    private int puzzle$modifyProgressFrame(int color) { // Set the Progress Bar Frame Color to our configured value //
-        return (!PuzzleConfig.resourcepackSplashScreen || PuzzleConfig.progressFrameColor == 16777215) ? color : PuzzleConfig.progressFrameColor | 255 << 24;
-    }
-    @ModifyArg(method = "drawProgressBar", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;fill(IIIII)V", ordinal = 0), index = 4)
-    private int puzzle$modifyProgressColor(int color) { // Set the Progress Bar Color to our configured value //
-        return (!PuzzleConfig.resourcepackSplashScreen || PuzzleConfig.progressBarColor == 16777215) ? color : PuzzleConfig.progressBarColor | 255 << 24;
-    }
-}
--- a/src/main/java/net/puzzlemc/splashscreen/mixin/RenderPipelinesAccessor.java
+++ b/src/main/java/net/puzzlemc/splashscreen/mixin/RenderPipelinesAccessor.java
@@ -1,23 +0,0 @@
-package net.puzzlemc.splashscreen.mixin;
-
-//? if > 1.21.1 {
-import com.mojang.blaze3d.pipeline.RenderPipeline;
-import net.minecraft.client.renderer.RenderPipelines;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(RenderPipelines.class)
-public interface RenderPipelinesAccessor {
-    @Accessor
-    static RenderPipeline.Snippet getGUI_TEXTURED_SNIPPET() {
-        return null;
-    }
-}
-//?} else {
-
-/*import eu.midnightdust.core.MidnightLib;
-import org.spongepowered.asm.mixin.Mixin;
-
-@Mixin(MidnightLib.class)
-public interface RenderPipelinesAccessor {} // TODO: Properly disable this mixin when on 1.21.1 and lower
-*///?}
--- a/src/main/resources/META-INF/neoforge.mods.toml
+++ b/src/main/resources/META-INF/neoforge.mods.toml
@@ -1,37 +0,0 @@
-modLoader = "javafml"
-loaderVersion = "[2,)"
-#issueTrackerURL = ""
-license = "MIT License"
-
-[[mods]]
-modId = "${id}"
-version = "${version}"
-displayName = "Puzzle"
-logoFile = "puzzle.png"
-authors = "PuzzleMC, Motschen"
-description = '''
-Unites optifine replacement mods in a clean & vanilla-style gui
-'''
-
-[[mixins]]
-config = "puzzle-gui.mixins.json"
-[[mixins]]
-config = "puzzle-models.mixins.json"
-[[mixins]]
-config = "puzzle-splashscreen.mixins.json"
-[[mixins]]
-config = "puzzle-splashscreen_neoforge.mixins.json"
-
-[[dependencies.puzzle]]
-modId = "neoforge"
-mandatory = true
-versionRange = "[21.0,)"
-ordering = "NONE"
-side = "CLIENT"
-
-[[dependencies.puzzle]]
-modId = "minecraft"
-mandatory = true
-versionRange = "${minecraft}"
-ordering = "NONE"
-side = "CLIENT"
--- a/src/main/resources/assets/puzzle/icon.png
+++ b/src/main/resources/assets/puzzle/icon.png
--- a/src/main/resources/assets/puzzle/lang/be_by.json
+++ b/src/main/resources/assets/puzzle/lang/be_by.json
@@ -1,42 +0,0 @@
-{
-	"puzzle.text.update_available":"Даступна абнаўленне!",
-	"puzzle.screen.title":"Налады Puzzle",
-	"puzzle.page.graphics":"Графіка",
-	"puzzle.page.resources":"Рэсурсы",
-	"puzzle.page.performance":"Прадукцыйнасць",
-	"puzzle.page.misc":"Рознае",
-	"puzzle.option.check_for_updates":"Праверыць абнаўленні",
-	"puzzle.option.check_for_updates.tooltip":"Уключае ўбудаваны правершчык абнаўленняў",
-	"puzzle.option.show_version_info":"Паказваць версію Puzzle",
-	"puzzle.option.show_version_info.tooltip":"Паказваць інфармацыю пра бягучую\nверсію Puzzle и наяўнасць абнаўленняў на\nтытульным экране і меню F3",
-	"puzzle.option.resourcepack_splash_screen":"Выкарыстанне пакетаў рэсурсаў для сплэшэй",
-	"puzzle.option.resourcepack_splash_screen.tooltip":"Уключае пакеты рэсурсаў, якія змяняюць\nзагрузачныя экраны/сплэшы\nMinecraft, якія выкарыстоўваюць фармат OptiFine",
-	"puzzle.option.better_splash_screen_blend":"Палепшанае спалучэнне сплэшэй і лагатыпу",
-	"puzzle.option.better_splash_screen_blend.tooltip":"Змяняе тып спалучэння\nлагатыпу і сплэшэй\nкаб палепшыць працу з лагатыпамі карыстальніцкіх колераў",
-	"puzzle.option.unlimited_model_rotations":"Неабмежаванае вярчэнне мадэлі",
-	"puzzle.option.unlimited_model_rotations.tooltip":"Дазваляе вярчэнне на 360° на карыстальніцкіх мадэляў блокаў/прадметаў",
-	"puzzle.option.bigger_custom_models":"Павялічаныя карыстальніцкія мадэлі",
-	"puzzle.option.bigger_custom_models.tooltip":"Павялічвае ліміт памеру\nкарыстальніцкіх мадэляў блокаў/прадметаў\nз 3x3x3 да 5x5x5",
-	"puzzle.midnightconfig.title":"Пашыраныя налады Puzzle",
-	"puzzle.midnightconfig.category.gui":"GUI",
-	"puzzle.midnightconfig.category.features":"Асаблівасці",
-	"puzzle.midnightconfig.category.debug":"Debug",
-	"puzzle.midnightconfig.tooltip":"Налады толькі для вопытных карыстальнікаў",
-
-	"cullleaves.puzzle.option.enabled": "Адбракоўваць лісце",
-	"cullleaves.puzzle.option.enabled.tooltip": "Уключыць адбракоўванне лісця, каб павялічыць прадукцыйнасць",
-	"iris.puzzle.option.enableShaders": "Уключыць шэйдэры",
-	"iris.puzzle.option.enableShaders.tooltip": "Дазваляе уключаць ці выключаць шэйдэры",
-	"iris.puzzle.option.open": "АДКРЫЦЬ",
-	"options.iris.shaderPackSelection.tooltip": "Адкрывае экран выбару\nшэйдэраў і іх налад",
-	"lambdabettergrass.option.mode.tooltip": "Робіць бакі\nзямлі з дзёрнам злучанымі з\nверхам гэтага блоку",
-	"lambdabettergrass.option.better_snow.tooltip": "Дадае крыху бачны слой снег/імху\nна непоўныя блокі, якія\nакружаны снегам/імхом",
-	"config.dynamicfps.reduce_when_unfocused.tooltip": "Зніжае FPS у Minecraft калі ён не актыўны\n(то бок калі іншая прагракма адчынена ці гульня згорнута)\nкаб захаваць рэсурсы сістэмы",
-	"config.dynamicfps.unfocused_fps.tooltip": "Колькасць кадраў у секунду, калі\nMinecraft згорнуты",
-	"config.dynamicfps.restore_when_hovered.tooltip": "Дазваляе скасаваць ці не\nабмежаванне FPS, калі Minecraft актыны\n(то бок актыўны ці наведзены курсорам з панелі задач)",
-	"config.dynamicfps.run_gc_on_unfocus.tooltip": "Запусціць збіральнік смецця калі\nMinecraft неактыўны,\n каб ачысціць крыху АЗУ",
-	"config.dynamicfps.unfocused_volume.tooltip": "Гучнасць прайгравальных гукаў\nкалі гульня не актыўна\n(то бок іншае акно абрана)",
-	"config.dynamicfps.hidden_volume.tooltip": "Гучнасць прайгравальных гукаў\nкали гульня не бачна\n(то бок згорнута, знаходзіцца пад іншымі вокнамі\nці на ішай віртуальнай машыне)",
-	"entity_texture_features.puzzle.emissive_type.brighter": "§eЯрчэй",
-	"entity_texture_features.puzzle.emissive_type.default": "§6Стандартна"
-}
--- a/src/main/resources/assets/puzzle/lang/de_de.json
+++ b/src/main/resources/assets/puzzle/lang/de_de.json
@@ -1,10 +1,10 @@
 {
 	"puzzle.text.update_available":"Ein Update ist verfügbar!",
 	"puzzle.screen.title":"Puzzle Einstellungen",
-	"puzzle.page.graphics":"Grafik",
-	"puzzle.page.resources":"Resourcen",
-	"puzzle.page.performance":"Performance",
-	"puzzle.page.misc":"Sonstiges",
+	"puzzle.page.graphics":"Grafik Einstellungen",
+	"puzzle.page.resources":"Resourcen Einstellungen",
+	"puzzle.page.performance":"Performance Einstellungen",
+	"puzzle.page.misc":"Sonstige Einstellungen",
 	"puzzle.option.check_for_updates":"Auf Updates überprüfen",
 	"puzzle.option.show_version_info":"Zeige Informationen über Puzzle's Version",
 	"puzzle.option.resourcepack_splash_screen":"Nutze Resourcepack-Ladebildschirm",
--- a/src/main/resources/assets/puzzle/lang/el_gr.json
+++ b/src/main/resources/assets/puzzle/lang/el_gr.json
@@ -1,10 +1,10 @@
 {
 	"puzzle.text.update_available":"Μια καινούρια έκδοση είναι διαθέσιμη!",
 	"puzzle.screen.title":"Ρυθμίσεις του Puzzle",
-	"puzzle.page.graphics":"Γραφικών",
-	"puzzle.page.resources":"Πόρων",
-	"puzzle.page.performance":"Απόδοσης",
-	"puzzle.page.misc":"Διάφορες",
+	"puzzle.page.graphics":"Ρυθμίσεις Γραφικών",
+	"puzzle.page.resources":"Ρυθμίσεις Πόρων",
+	"puzzle.page.performance":"Ρυθμίσεις Απόδοσης",
+	"puzzle.page.misc":"Διάφορες Ρυθμίσεις",
 	"puzzle.option.check_for_updates":"Έλεγχος για αναβαθμίσεις",
 	"puzzle.option.show_version_info":"Εμφάνηση έκδοσης του Puzzle",
 	"puzzle.option.resourcepack_splash_screen":"Οθόνη φόρτωσης πακέτου πόρων",
--- a/src/main/resources/assets/puzzle/lang/en_us.json
+++ b/src/main/resources/assets/puzzle/lang/en_us.json
@@ -1,11 +1,10 @@
 {
 	"puzzle.text.update_available":"An update is available!",
 	"puzzle.screen.title":"Puzzle Settings",
-	"puzzle.page.graphics":"Graphics",
-	"puzzle.page.resources":"Resource",
-	"puzzle.page.performance":"Performance",
-	"puzzle.page.misc":"Miscellaneous",
-    "puzzle.action.open_config_screen":"Open config screen",
+	"puzzle.page.graphics":"Graphics Settings",
+	"puzzle.page.resources":"Resource Settings",
+	"puzzle.page.performance":"Performance Settings",
+	"puzzle.page.misc":"Miscellaneous Settings",
 	"puzzle.option.check_for_updates":"Check for Updates",
 	"puzzle.option.check_for_updates.tooltip":"Enables Puzzle's built-in update checker",
 	"puzzle.option.show_version_info":"Show Puzzle version info",
@@ -19,9 +18,6 @@
 	"puzzle.option.bigger_custom_models":"Bigger Custom Models",
 	"puzzle.option.bigger_custom_models.tooltip":"Increases the limit of\ncustom block/item model sizes\nfrom 3x3x3 to 5x5x5",
 	"puzzle.midnightconfig.title":"Puzzle Advanced Config",
-	"puzzle.midnightconfig.category.gui":"GUI",
-	"puzzle.midnightconfig.category.features":"Features",
-	"puzzle.midnightconfig.category.internal":"Internal",
 	"puzzle.midnightconfig.tooltip":"Options for advanced users only",

 	"cullleaves.puzzle.option.enabled": "Cull Leaves",
@@ -37,7 +33,5 @@
 	"config.dynamicfps.restore_when_hovered.tooltip": "Whether or not to stop the\nFPS limiting while Minecraft is previewed\n(i.e. hovered on task bar or dock)",
 	"config.dynamicfps.run_gc_on_unfocus.tooltip": "Run a garbage collector while\nMinecraft is not focused to\nfree up some RAM",
 	"config.dynamicfps.unfocused_volume.tooltip": "The volume the game should play\nsound at while unfocused\n(i.e. another window is selected)",
-	"config.dynamicfps.hidden_volume.tooltip": "The volume the game should play\nsound at while not visible\n(i.e. minimized, covered by other windows\nor on another virtual desktop)",
-	"entity_texture_features.puzzle.emissive_type.brighter": "§eBrighter",
-	"entity_texture_features.puzzle.emissive_type.default": "§6Default"
+	"config.dynamicfps.hidden_volume.tooltip": "The volume the game should play\nsound at while not visible\n(i.e. minimized, covered by other windows\nor on another virtual desktop)"
 }
--- a/src/main/resources/assets/puzzle/lang/es_es.json
+++ b/src/main/resources/assets/puzzle/lang/es_es.json
@@ -1,42 +0,0 @@
-{
-	"puzzle.text.update_available":"¡Hay una actualización disponible!",
-	"puzzle.screen.title":"Configuración de Puzzle",
-	"puzzle.page.graphics":"Gráficos",
-	"puzzle.page.resources":"Recursos",
-	"puzzle.page.performance":"Rendimiento",
-	"puzzle.page.misc":"Variado",
-	"puzzle.option.check_for_updates":"Comprobar Actualizaciones",
-	"puzzle.option.check_for_updates.tooltip":"Activa el comprobador de actualizaciones integrado de Puzzle.",
-	"puzzle.option.show_version_info":"Mostrar información de la versión Puzzle",
-	"puzzle.option.show_version_info.tooltip":"Muestra información sobre la versión actual\nde Puzzle y el estado de actualización\nen la pantalla de título y en el menú F3.",
-	"puzzle.option.resourcepack_splash_screen":"Usar la Pantalla de Carga del Paquete de Recursos [*]",
-	"puzzle.option.resourcepack_splash_screen.tooltip":"Permite que los paquetes de recursos\ncambien el aspecto de la pantalla de carga/principal\nde Minecraft utilizando el formato OptiFine.",
-	"puzzle.option.better_splash_screen_blend":"Mejor Mezcla del Logo de la Pantalla de Carga",
-	"puzzle.option.better_splash_screen_blend.tooltip":"Cambia el tipo de mezcla utilizada\npor el logotipo de la pantalla de carga\npara que funcione mejor con logotipos\nde colores personalizados.",
-	"puzzle.option.unlimited_model_rotations":"Rotaciones Ilimitadas de Modelos",
-	"puzzle.option.unlimited_model_rotations.tooltip":"Desbloquea la rotación completa de 360° en los modelos de bloques/objetos personalizados.",
-	"puzzle.option.bigger_custom_models":"Modelos Personalizados más Grandes",
-	"puzzle.option.bigger_custom_models.tooltip":"Aumenta el límite de tamaños\nde los modelos de bloques/objetos personalizados\nde 3x3x3 a 5x5x5.",
-	"puzzle.midnightconfig.title":"Acceder a las Opciones adicionales de Puzzle para Expertos",
-	"puzzle.midnightconfig.category.gui":"Interfaz",
-	"puzzle.midnightconfig.category.features":"Características",
-	"puzzle.midnightconfig.category.debug":"Depuración",
-	"puzzle.midnightconfig.tooltip":"Ajustes para usuarios experimentados.",
-
-	"cullleaves.puzzle.option.enabled": "Reducir Cantidad de Hojas",
-	"cullleaves.puzzle.option.enabled.tooltip": "Permitir reducir la cantidad de hojas para mejorar el rendimiento.",
-	"iris.puzzle.option.enableShaders": "Activar Sombreadores",
-	"iris.puzzle.option.enableShaders.tooltip": "Activar o no los paquetes de sombreadores.",
-	"iris.puzzle.option.open": "ABRIR",
-	"options.iris.shaderPackSelection.tooltip": "Abre la pantalla de selección\nde los paquetes de sombreadores.",
-	"lambdabettergrass.option.mode.tooltip": "Hace que los lados de los bloques de\ncésped se conecten con los bloques de\ncésped adyacentes.",
-	"lambdabettergrass.option.better_snow.tooltip": "Añade una capa de nieve/musgo puramente\nvisual a los bloques no llenos que están rodeados\nde nieve/musgo.",
-	"config.dynamicfps.reduce_when_unfocused.tooltip": "Reduce los FPS de Minecraft cuando el\njuego se encuentra en segundo plano (es decir,\ncuando otra ventana está en primer plano o el juego\nestá oculto) para ahorrar energía y recursos\ndel sistema.",
-	"config.dynamicfps.unfocused_fps.tooltip": "La cantidad de fotogramas por segundo que\nMinecraft puede renderizar mientras se\nencuentra en segundo plano.",
-	"config.dynamicfps.restore_when_hovered.tooltip": "Detener o no la limitación de FPS mientras\ndurante la previsualización de Minecraft\n(por ejemplo cuando se señala en la barra de\ntareas o en el área de notificación).",
-	"config.dynamicfps.run_gc_on_unfocus.tooltip": "Ejecutar un recolector de basura mientras\nMinecraft se encuentra en segundo plano\npara liberar algo de RAM.",
-	"config.dynamicfps.unfocused_volume.tooltip": "El volumen del sonido del juego cuando permanece\nen segundo plano (es decir, cuando hay otra\nventana seleccionada).",
-	"config.dynamicfps.hidden_volume.tooltip": "El volumen del juego cuando no es visible (es decir, minimizado, cubierto por otras ventanas o en otro escritorio virtual).",
-	"entity_texture_features.puzzle.emissive_type.brighter": "§eResplandeciente",
-	"entity_texture_features.puzzle.emissive_type.default": "§6Predeterminado"
-}
--- a/src/main/resources/assets/puzzle/lang/et_ee.json
+++ b/src/main/resources/assets/puzzle/lang/et_ee.json
@@ -1,10 +1,10 @@
 {
 	"puzzle.text.update_available":"Uuendus on saadaval!",
 	"puzzle.screen.title":"Puzzle sätted",
-	"puzzle.page.graphics":"Graafika",
-	"puzzle.page.resources":"Ressursi",
-	"puzzle.page.performance":"Jõudlus",
-	"puzzle.page.misc":"Muud",
+	"puzzle.page.graphics":"Graafikasätted",
+	"puzzle.page.resources":"Ressursisätted",
+	"puzzle.page.performance":"Jõudlussätted",
+	"puzzle.page.misc":"Muud sätted",
 	"puzzle.option.check_for_updates":"Uuenduste kontroll",
 	"puzzle.option.show_version_info":"Kuva Puzzle versiooniteavet",
 	"puzzle.option.resourcepack_splash_screen":"Kasuta ressursipaki laadimiskuva",
--- a/src/main/resources/assets/puzzle/lang/ko_kr.json
+++ b/src/main/resources/assets/puzzle/lang/ko_kr.json
@@ -1,10 +1,10 @@
 {
 	"puzzle.text.update_available":"업데이트가 가능합니다!",
 	"puzzle.screen.title":"Puzzle 설정",
-	"puzzle.page.graphics":"그래픽",
-	"puzzle.page.resources":"리소스",
-	"puzzle.page.performance":"성능",
-	"puzzle.page.misc":"기타",
+	"puzzle.page.graphics":"그래픽 설정",
+	"puzzle.page.resources":"리소스 설정",
+	"puzzle.page.performance":"성능 설정",
+	"puzzle.page.misc":"기타 설정",
 	"puzzle.option.check_for_updates":"업데이트 확인",
 	"puzzle.option.show_version_info":"Puzzle 버전 정보 보기",
 	"puzzle.option.resourcepack_splash_screen":"스플래시 화면에서 리소스팩 사용",
--- a/src/main/resources/assets/puzzle/lang/pl_pl.json
+++ b/src/main/resources/assets/puzzle/lang/pl_pl.json
@@ -1,10 +1,10 @@
 {
 	"puzzle.text.update_available":"Aktualizacja jest dostępna!",
 	"puzzle.screen.title":"Ustawienia Puzzle",
-	"puzzle.page.graphics":"Grafiki",
-	"puzzle.page.resources":"Zasobów",
-	"puzzle.page.performance":"Wydajności",
-	"puzzle.page.misc":"Ustawienia",
+	"puzzle.page.graphics":"Ustawienia grafiki",
+	"puzzle.page.resources":"Ustawienia zasobów",
+	"puzzle.page.performance":"Ustawienia wydajności",
+	"puzzle.page.misc":"Różne ustawienia",
 	"puzzle.option.check_for_updates":"Sprawdź aktualizacje",
 	"puzzle.option.show_version_info":"Pokaż informacje o wersji Puzzle",
 	"puzzle.option.resourcepack_splash_screen":"Użyj ekranu powitalnego paczek zasobów",
--- a/src/main/resources/assets/puzzle/lang/pt_br.json
+++ b/src/main/resources/assets/puzzle/lang/pt_br.json
@@ -1,42 +0,0 @@
-{
-	"puzzle.text.update_available":"Uma atualização está disponível!",
-	"puzzle.screen.title":"Configurações do Puzzle",
-	"puzzle.page.graphics":"Gráficas",
-	"puzzle.page.resources":"Recursos",
-	"puzzle.page.performance":"Desempenho",
-	"puzzle.page.misc":"Diversas",
-	"puzzle.option.check_for_updates":"Verifique se há atualizações",
-	"puzzle.option.check_for_updates.tooltip":"Ativa o verificador de atualização integrado do Puzzle",
-	"puzzle.option.show_version_info":"Mostrar informações da versão do Puzzle",
-	"puzzle.option.show_version_info.tooltip":"Mostrar informações sobre o atual\nversão do Puzzle e status de atualização em\n Tela de Título e o Menu F3",
-	"puzzle.option.resourcepack_splash_screen":"Use a tela inicial do pacote de recursos",
-	"puzzle.option.resourcepack_splash_screen.tooltip":"Permite que os pacotes de recursos mudem a aparência\ndo carregamento do Minecraft/splash\ntela usando o formato OptiFine",
-	"puzzle.option.better_splash_screen_blend":"Melhor combinação do logotipo da tela inicial",
-	"puzzle.option.better_splash_screen_blend.tooltip":"Muda o tipo de mistura usado\npelo logotipo na tela inicial\npara trabalhar melhor com logotipos coloridos personalizados",
-	"puzzle.option.unlimited_model_rotations":"Rotações de Modelo Ilimitadas",
-	"puzzle.option.unlimited_model_rotations.tooltip":"Desbloqueia rotação total de 360° em modelos de itens/blocos personalizados",
-	"puzzle.option.bigger_custom_models":"Modelos Personalizados Maiores",
-	"puzzle.option.bigger_custom_models.tooltip":"Aumenta o limite de\ntamanhos de modelo de bloco/item personalizados\nde 3x3x3 a 5x5x5",
-	"puzzle.midnightconfig.title":"Configuração Avançada do Puzzle",
-	"puzzle.midnightconfig.category.gui":"GUI",
-	"puzzle.midnightconfig.category.features":"Recursos",
-	"puzzle.midnightconfig.category.internal":"Interno",
-	"puzzle.midnightconfig.tooltip":"Opções apenas para usuários avançados",
-
-	"cullleaves.puzzle.option.enabled": "Abate de Folhas",
-	"cullleaves.puzzle.option.enabled.tooltip": "Ative o abate de folhas para melhorar o desempenho",
-	"iris.puzzle.option.enableShaders": "Ativar sombreadores",
-	"iris.puzzle.option.enableShaders.tooltip": "Habilitar ou não shaderpacks",
-	"iris.puzzle.option.open": "ABRIR",
-	"options.iris.shaderPackSelection.tooltip": "Abra uma tela para selecionar\nshaderpacks e configurá-los",
-	"lambdabettergrass.option.mode.tooltip": "Faz os lados de\nblocos de grama se conectam a\nblocos de grama adjacentes",
-	"lambdabettergrass.option.better_snow.tooltip": "Adiciona uma neve puramente visual/camada de musgo\na blocos não completos que\nestão rodeados de neve/musgo",
-	"config.dynamicfps.reduce_when_unfocused.tooltip": "Reduz o FPS do Minecraft quando desfocado\n(ou seja, outra janela está focada ou o jogo está oculto)\npara economizar energia e recursos do sistema",
-	"config.dynamicfps.unfocused_fps.tooltip": "A quantidade de quadros por segundo\nMinecraft é permitido\nrenderizar enquanto estiver fora de foco",
-	"config.dynamicfps.restore_when_hovered.tooltip": "Interromper ou não o\nLimitação de FPS enquanto o Minecraft é visualizado\n(ou seja, pairou na barra de tarefas ou dock)",
-	"config.dynamicfps.run_gc_on_unfocus.tooltip": "Execute um coletor de lixo enquanto\nMinecraft não está focado em\nliberar um pouco de RAM",
-	"config.dynamicfps.unfocused_volume.tooltip": "O volume que o jogo deve reproduzir\nsom enquanto desfocado\n(ou seja, outra janela é selecionada)",
-	"config.dynamicfps.hidden_volume.tooltip": "O volume que o jogo deve reproduzir\nsom em enquanto não visível\n(ou seja, minimizado, coberto por outras janelas\nem em outra área de trabalho virtual)",
-	"entity_texture_features.puzzle.emissive_type.brighter": "§eMais Brilhante",
-	"entity_texture_features.puzzle.emissive_type.default": "§6Padrão"
-}
--- a/src/main/resources/assets/puzzle/lang/ru_ru.json
+++ b/src/main/resources/assets/puzzle/lang/ru_ru.json
@@ -1,10 +1,10 @@
 {
 	"puzzle.text.update_available":"Доступно обновление!",
 	"puzzle.screen.title":"Настройки Puzzle",
-	"puzzle.page.graphics":"Графика",
-	"puzzle.page.resources":"Ресурсы",
-	"puzzle.page.performance":"Оптимизация",
-	"puzzle.page.misc":"Прочие",
+	"puzzle.page.graphics":"Настройки графики",
+	"puzzle.page.resources":"Настройки ресурсов",
+	"puzzle.page.performance":"Производительность",
+	"puzzle.page.misc":"Прочие настройки",
 	"puzzle.option.check_for_updates":"Проверять обновления",
 	"puzzle.option.check_for_updates.tooltip":"Включить встроенную в Puzzle проверку обновлений",
 	"puzzle.option.show_version_info":"Показывать информацию о версии",
@@ -18,13 +18,10 @@
 	"puzzle.option.bigger_custom_models":"Увеличенный размер моделей",
 	"puzzle.option.bigger_custom_models.tooltip":"Увеличить предельный размер\nпользовательских моделей блоков\nи предметов с 3×3×3 до 5×5×5",
 	"puzzle.midnightconfig.title":"Расширенные настройки Puzzle",
-	"puzzle.midnightconfig.category.gui":"Интерфейс",
-	"puzzle.midnightconfig.category.features":"Функционал",
-	"puzzle.midnightconfig.category.debug":"Отладка",
 	"puzzle.midnightconfig.tooltip":"Только для продвинутых пользователей!",

-	"cullleaves.puzzle.option.enabled": "Отбраковка листьев",
-	"cullleaves.puzzle.option.enabled.tooltip": "Включить отбраковку блоков листьев\nдля улучшения производительности",
+	"cullleaves.puzzle.option.enabled": "Отбраковка листвы",
+	"cullleaves.puzzle.option.enabled.tooltip": "Включить отбраковку блоков листвы\nдля улучшения производительности",
 	"iris.puzzle.option.enableShaders": "Шейдеры",
 	"iris.puzzle.option.enableShaders.tooltip": "Включить выбранный набор шейдеров",
 	"iris.puzzle.option.open": "Выбрать  ",
@@ -38,11 +35,5 @@
 	"config.dynamicfps.unfocused_volume.tooltip": "Громкость звука игры в состоянии фона\n(когда активно другое окно)",
 	"config.dynamicfps.hidden_volume.tooltip": "Громкость звука игры в скрытом состоянии\n(когда окно свёрнуто, закрыто другим окном\nили находится на другом рабочем столе)",
 	"entity_texture_features.puzzle.emissive_type.brighter": "§eЯркие",
-	"entity_texture_features.puzzle.emissive_type.default": "§6Обычные",
-
-	"modmenu.descriptionTranslation.puzzle": "Функции улучшения внешнего вида и производительности.",
-	"modmenu.descriptionTranslation.puzzle-base": "Общий код всех модулей Puzzle.",
-	"modmenu.descriptionTranslation.puzzle-gui": "Альтернативы Optifine, объединённые в едином меню.",
-	"modmenu.descriptionTranslation.puzzle-models": "Больше свободы моделям блоков и предметов!",
-	"modmenu.descriptionTranslation.puzzle-splashscreen": "Свой экран загрузки при помощи наборов ресурсов."
+	"entity_texture_features.puzzle.emissive_type.default": "§6Обычные"
 }
--- a/src/main/resources/assets/puzzle/lang/vi_vn.json
+++ b/src/main/resources/assets/puzzle/lang/vi_vn.json
@@ -1,42 +0,0 @@
-{
-	"puzzle.text.update_available":"Đã có bản cập nhật!",
-	"puzzle.screen.title":"Cài đặt Puzzle",
-	"puzzle.page.graphics":"Đồ họa",
-	"puzzle.page.resources":"Tài nguyên",
-	"puzzle.page.performance":"Hiệu năng",
-	"puzzle.page.misc":"Khác",
-	"puzzle.option.check_for_updates":"Kiểm tra cập nhật",
-	"puzzle.option.check_for_updates.tooltip":"Bật trình kiểm tra cập nhật tích hợp của Puzzle",
-	"puzzle.option.show_version_info":"Hiển thị thông tin phiên bản Puzzle",
-	"puzzle.option.show_version_info.tooltip":"Hiển thị thông tin về phiên bản \nPuzzle hiện tại và trạng thái cập nhật trên\nMàn hình Tiêu đề và Menu F3",
-	"puzzle.option.resourcepack_splash_screen":"Sử dụng màn hình đốm gói tài nguyên",
-	"puzzle.option.resourcepack_splash_screen.tooltip":"Cho phép gói tài nguyên thay đổi giao diện\nmàn hình tải/đốm\ncủa Minecraft bằng định dạng OptiFine",
-	"puzzle.option.better_splash_screen_blend":"Logo màn hình đốm tốt hơn",
-	"puzzle.option.better_splash_screen_blend.tooltip":"Thay đổi kiểu hòa trộn được sử dụng\nbởi biểu trưng trên màn hình đốm\nđể hoạt động tốt hơn với các biểu trưng có màu tùy chỉnh",
-	"puzzle.option.unlimited_model_rotations":"Xoay mô hình không giới hạn",
-	"puzzle.option.unlimited_model_rotations.tooltip":"Mở khóa xoay 360° đầy đủ trên các mô hình khối/vật phẩm tùy chỉnh",
-	"puzzle.option.bigger_custom_models":"Mô hình tùy chỉnh lớn hơn",
-	"puzzle.option.bigger_custom_models.tooltip":"Tăng giới hạn của\nkích thước mô hình khối/vật phẩm tùy chỉnh\ntừ 3x3x3 lên 5x5x5",
-	"puzzle.midnightconfig.title":"Cấu hình Puzzle nâng cao",
-	"puzzle.midnightconfig.category.gui":"GUI",
-	"puzzle.midnightconfig.category.features":"Tính năng",
-	"puzzle.midnightconfig.category.debug":"Gỡ lỗi",
-	"puzzle.midnightconfig.tooltip":"Tùy chọn chỉ dành cho người dùng nâng cao",
-
-	"cullleaves.puzzle.option.enabled": "Loại bỏ Lá",
-	"cullleaves.puzzle.option.enabled.tooltip": "Bật tính năng loại bỏ lá để nâng cao hiệu suất",
-	"iris.puzzle.option.enableShaders": "Bật Shader",
-	"iris.puzzle.option.enableShaders.tooltip": "Bật shaderpack",
-	"iris.puzzle.option.open": "MỞ",
-	"options.iris.shaderPackSelection.tooltip": "Mở một màn hình để chọn\nshaderpack và định cấu hình chúng",
-	"lambdabettergrass.option.mode.tooltip": "Làm cho các cạnh của\nkhối cỏ kết nối với\nkhối cỏ liền kề",
-	"lambdabettergrass.option.better_snow.tooltip": "Thêm một lớp tuyết/rêu hoàn toàn trực quan\nvào các khối không đầy đủ\nđược bao quanh bởi tuyết/rêu",
-	"config.dynamicfps.reduce_when_unfocused.tooltip": "Giảm FPS của Minecraft khi không tập trung\n(tức là một cửa sổ khác được tập trung hoặc trò chơi bị ẩn)\nđể tiết kiệm năng lượng và tài nguyên hệ thống",
-	"config.dynamicfps.unfocused_fps.tooltip": "Lượng khung hình mỗi giây\nMinecraft được phép\nkết xuất khi không tập trung",
-	"config.dynamicfps.restore_when_hovered.tooltip": "Dừng giới hạn\nFPS trong khi Minecraft được xem trước\n(tức là được di chuột trên thanh tác vụ hoặc thanh công cụ)",
-	"config.dynamicfps.run_gc_on_unfocus.tooltip": "Chạy trình thu gom rác trong khi\nMinecraft không tập trung vào\ngiải phóng một số RAM",
-	"config.dynamicfps.unfocused_volume.tooltip": "Âm lượng mà trò chơi sẽ phát\nâm thanh khi không tập trung\n(tức là một cửa sổ khác được chọn)",
-	"config.dynamicfps.hidden_volume.tooltip": "Âm lượng mà trò chơi sẽ phát\nâm thanh trong khi không hiển thị\n(tức là được thu nhỏ, bị che bởi các cửa sổ khác\ncũng như trên màn hình ảo khác)",
-	"entity_texture_features.puzzle.emissive_type.brighter": "§eSáng hơn",
-	"entity_texture_features.puzzle.emissive_type.default": "§6Mặc định"
-}
--- a/src/main/resources/assets/puzzle/lang/zh_tw.json
+++ b/src/main/resources/assets/puzzle/lang/zh_tw.json
@@ -1,42 +1,17 @@
 {
-	"puzzle.text.update_available":"有新的更新可用！",
-	"puzzle.screen.title":"Puzzle 設定",
-	"puzzle.page.graphics":"圖形",
-	"puzzle.page.resources":"資源",
-	"puzzle.page.performance":"效能",
-	"puzzle.page.misc":"其他",
+	"puzzle.text.update_available":"有新版本可供升級！",
+	"puzzle.screen.title":"拼圖設置",
+	"puzzle.page.graphics":"顯示設置",
+	"puzzle.page.resources":"資源設置",
+	"puzzle.page.performance":"性能設置",
+	"puzzle.page.misc":"其他設置",
 	"puzzle.option.check_for_updates":"檢查更新",
-	"puzzle.option.check_for_updates.tooltip":"啟用 Puzzle 內建的更新檢查器",
-	"puzzle.option.show_version_info":"顯示 Puzzle 版本資訊",
-	"puzzle.option.show_version_info.tooltip":"在標題畫面和 F3 選單上顯示\n目前 Puzzle 版本和更新狀態的資訊",
-	"puzzle.option.resourcepack_splash_screen":"使用資源包的啟動畫面",
-	"puzzle.option.resourcepack_splash_screen.tooltip":"允許資源包使用 OptiFine 格式變更\nMinecraft 的載入/啟動畫面",
-	"puzzle.option.better_splash_screen_blend":"更好的啟動畫面標誌混合",
-	"puzzle.option.better_splash_screen_blend.tooltip":"變更啟動畫面標誌使用的混合類型，\n使其更好地與自訂顏色的標誌配合使用",
+	"puzzle.option.show_version_info":"顯示拼圖版本信息",
+	"puzzle.option.resourcepack_splash_screen":"使用資源包的加載界面",
+	"puzzle.option.disable_splash_screen_blend":"禁止加載界面徽標渲染",
+	"puzzle.option.emissive_textures":"發光貼圖",
 	"puzzle.option.unlimited_model_rotations":"無限模型旋轉",
-	"puzzle.option.unlimited_model_rotations.tooltip":"解鎖自訂方塊/物品模型的完整 360° 旋轉",
-	"puzzle.option.bigger_custom_models":"更大的自訂模型",
-	"puzzle.option.bigger_custom_models.tooltip":"將自訂方塊/物品模型的大小限制\n從 3×3×3 增加到 5×5×5",
-	"puzzle.midnightconfig.title":"Puzzle 進階設定",
-	"puzzle.midnightconfig.category.gui":"介面",
-	"puzzle.midnightconfig.category.features":"功能",
-	"puzzle.midnightconfig.category.internal":"內部",
-	"puzzle.midnightconfig.tooltip":"僅供進階使用者使用的選項",
-
-	"cullleaves.puzzle.option.enabled": "剔除樹葉",
-	"cullleaves.puzzle.option.enabled.tooltip": "啟用樹葉剔除以提升效能",
-	"iris.puzzle.option.enableShaders": "啟用光影",
-	"iris.puzzle.option.enableShaders.tooltip": "是否啟用光影包",
-	"iris.puzzle.option.open": "開啟",
-	"options.iris.shaderPackSelection.tooltip": "開啟一個畫面以選擇\n並設定光影包",
-	"lambdabettergrass.option.mode.tooltip": "使草地的側面與\n相鄰的草地連接",
-	"lambdabettergrass.option.better_snow.tooltip": "為被雪/苔蘚包圍的非完整方塊\n加入純粹視覺上的雪/苔蘚層",
-	"config.dynamicfps.reduce_when_unfocused.tooltip": "在未聚焦時降低 Minecraft 的 FPS\n（例如，另一個視窗被聚焦或遊戲被隱藏）\n以節省電力和系統資源",
-	"config.dynamicfps.unfocused_fps.tooltip": "Minecraft 在未聚焦時\n允許繪製的 FPS",
-	"config.dynamicfps.restore_when_hovered.tooltip": "當預覽 Minecraft 時是否停止\nFPS 限制（例如，將滑鼠懸停在工作列或 Dock 上）",
-	"config.dynamicfps.run_gc_on_unfocus.tooltip": "在 Minecraft 未聚焦時執行垃圾回收器\n以釋放一些記憶體",
-	"config.dynamicfps.unfocused_volume.tooltip": "遊戲在未聚焦時播放聲音的音量\n（例如，選取了另一個視窗）",
-	"config.dynamicfps.hidden_volume.tooltip": "遊戲在不可見時播放聲音的音量\n（例如，最小化、被其他視窗覆蓋\n或在另一個虛擬桌面上）",
-	"entity_texture_features.puzzle.emissive_type.brighter": "§e更亮",
-	"entity_texture_features.puzzle.emissive_type.default": "§6預設"
+	"puzzle.option.bigger_custom_models":"更大的自定義模型",
+	"puzzle.option.render_layer_overrides":"覆蓋渲染層",
+	"puzzle.midnightconfig.title":"拼圖高級設置"
 }
--- a/src/main/resources/assets/puzzle/textures/gui/sprites/icon/button.png
+++ b/src/main/resources/assets/puzzle/textures/gui/sprites/icon/button.png
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -1,10 +1,10 @@
 {
  "schemaVersion": 1,
-  "id": "${id}",
+  "id": "puzzle",
  "version": "${version}",

  "name": "Puzzle",
-  "description": "Unites optifine replacement mods in a clean & vanilla-style gui",
+  "description": "Fancy and performance-improving features.",
  "authors": [
    "PuzzleMC",
    "Motschen"
@@ -20,27 +20,7 @@

  "environment": "client",

-  "entrypoints": {
-    "client": [
-      "net.puzzlemc.core.PuzzleClient"
-    ],
-    "modmenu": [
-      "net.puzzlemc.core.PuzzleClient"
-    ]
-  },
-
-  "mixins": [
-    "puzzle-gui.mixins.json",
-    "puzzle-models.mixins.json",
-    "puzzle-splashscreen.mixins.json"
-  ],
-
  "depends": {
-    "fabric": "*",
-    "minecraft": "${minecraft}"
-  },
-  "breaks": {
-    "entity_texture_features": "<7.0.0",
-    "entity_model_features": "<3.0.0"
+    "fabric": "*"
  }
 }
--- a/src/main/resources/puzzle-models.accesswidener
+++ b/src/main/resources/puzzle-models.accesswidener
@@ -1,7 +0,0 @@
-accessWidener	v1	named
-accessible class net/minecraft/client/renderer/block/model/BlockElement$Deserializer
-accessible method net/minecraft/client/render/RenderLayer of (Ljava/lang/String;ILcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;)Lnet/minecraft/client/render/RenderLayer$MultiPhase;
-accessible class net/minecraft/client/render/RenderLayer$MultiPhaseParameters
-accessible class net/minecraft/client/render/RenderPhase$Texture
-accessible method net/minecraft/client/render/RenderLayer$MultiPhaseParameters$Builder texture (Lnet/minecraft/client/render/RenderPhase$TextureBase;)Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters$Builder;
-accessible method net/minecraft/client/render/RenderLayer$MultiPhaseParameters$Builder build (Z)Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;
--- a/stonecutter.gradle.kts
+++ b/stonecutter.gradle.kts
@@ -1,16 +0,0 @@
-plugins {
-    id("dev.kikugie.stonecutter")
-    id("dev.architectury.loom") version "1.13-SNAPSHOT" apply false
-    id("architectury-plugin") version "3.4-SNAPSHOT" apply false
-    id("com.github.johnrengelman.shadow") version "8.1.1" apply false
-    id("me.modmuss50.mod-publish-plugin") version "0.8.4" apply false
-}
-stonecutter active "1.21.10-fabric" /* [SC] DO NOT EDIT */
-
-// See https://stonecutter.kikugie.dev/wiki/config/params
-stonecutter parameters {
-    swaps["mod_version"] = "\"" + property("mod.version") + "\";"
-    swaps["minecraft"] = "\"" + node.metadata.version + "\";"
-    constants["release"] = property("mod.id") != "template"
-    dependencies["fapi"] = node.project.property("deps.fabric_version") as String
-}
--- a/versions/1.20.1-fabric/gradle.properties
+++ b/versions/1.20.1-fabric/gradle.properties
@@ -1,15 +0,0 @@
-mod.mc_dep_fabric=>=1.20 <=1.20.1
-mod.mc_dep_forgelike=[1.20, 1.20.1]
-mod.mc_title=1.20.1
-mod.mc_targets=1.20 1.20.1
-
-deps.forge_loader=47.3.0
-deps.neoforge_loader=[UNSUPPORTED]
-
-deps.fabric_version=0.92.3+1.20.1
-deps.modmenu_version=7.2.2
-
-jigsaws.emf_version=3.0.6-fabric-1.20.1
-jigsaws.etf_version=7.0.6-fabric-1.20.1
-
-loom.platform=fabric
--- a/versions/1.20.1-fabric/src/main/resources/assets/puzzle/icon/button.png
+++ b/versions/1.20.1-fabric/src/main/resources/assets/puzzle/icon/button.png
--- a/versions/1.21.1-fabric/gradle.properties
+++ b/versions/1.21.1-fabric/gradle.properties
@@ -1,16 +0,0 @@
-mod.mc_dep_fabric=>=1.21 <=1.21.1
-mod.mc_dep_forgelike=[1.21, 1.21.1]
-mod.mc_title=1.21.1
-mod.mc_targets=1.21 1.21.1
-
-deps.forge_loader=0
-deps.neoforge_loader=21.1.66
-
-deps.fabric_version=0.114.0+1.21.1
-
-deps.modmenu_version=11.0.3
-
-jigsaws.emf_version=3.0.6-fabric-1.21
-jigsaws.etf_version=7.0.6-fabric-1.21
-
-loom.platform=fabric
--- a/Show More
+++ b/Show More