diff --git a/src/client/java/io/gitlab/jfronny/respackopts/RpoClientCommand.java b/src/client/java/io/gitlab/jfronny/respackopts/RpoClientCommand.java
index 25a4cf0..aa8f2b1 100644
--- a/src/client/java/io/gitlab/jfronny/respackopts/RpoClientCommand.java
+++ b/src/client/java/io/gitlab/jfronny/respackopts/RpoClientCommand.java
@@ -1,11 +1,11 @@
 package io.gitlab.jfronny.respackopts;
 
 import com.mojang.brigadier.Command;
-import io.gitlab.jfronny.respackopts.integration.SaveHook;
 import io.gitlab.jfronny.respackopts.util.MetaCache;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
-import net.fabricmc.loader.api.*;
+import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.loader.api.Version;
 import net.minecraft.text.Text;
 
 import java.io.BufferedWriter;
diff --git a/src/client/java/io/gitlab/jfronny/respackopts/integration/FrexCompat.java b/src/client/java/io/gitlab/jfronny/respackopts/integration/FrexCompat.java
index 1595e09..c3a8bfe 100644
--- a/src/client/java/io/gitlab/jfronny/respackopts/integration/FrexCompat.java
+++ b/src/client/java/io/gitlab/jfronny/respackopts/integration/FrexCompat.java
@@ -1,7 +1,8 @@
 package io.gitlab.jfronny.respackopts.integration;
 
-import io.gitlab.jfronny.respackopts.*;
-import io.vram.frex.api.config.*;
+import io.gitlab.jfronny.respackopts.Respackopts;
+import io.gitlab.jfronny.respackopts.RespackoptsClient;
+import io.vram.frex.api.config.ShaderConfig;
 
 public class FrexCompat {
     public static void init() {
diff --git a/src/client/java/io/gitlab/jfronny/respackopts/mixin/OptionsScreenMixin.java b/src/client/java/io/gitlab/jfronny/respackopts/mixin/OptionsScreenMixin.java
index 218fd90..2f29d9b 100644
--- a/src/client/java/io/gitlab/jfronny/respackopts/mixin/OptionsScreenMixin.java
+++ b/src/client/java/io/gitlab/jfronny/respackopts/mixin/OptionsScreenMixin.java
@@ -4,9 +4,7 @@ import io.gitlab.jfronny.respackopts.*;
 import net.minecraft.client.gui.screen.option.OptionsScreen;
 import net.minecraft.client.option.GameOptions;
 import net.minecraft.resource.ResourcePackManager;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.*;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
diff --git a/src/client/java/io/gitlab/jfronny/respackopts/mixin/PackScreenMixin.java b/src/client/java/io/gitlab/jfronny/respackopts/mixin/PackScreenMixin.java
index 707ae4c..780b65a 100644
--- a/src/client/java/io/gitlab/jfronny/respackopts/mixin/PackScreenMixin.java
+++ b/src/client/java/io/gitlab/jfronny/respackopts/mixin/PackScreenMixin.java
@@ -1,15 +1,11 @@
 package io.gitlab.jfronny.respackopts.mixin;
 
 import io.gitlab.jfronny.respackopts.Respackopts;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.*;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
-import java.nio.file.Path;
-import java.nio.file.WatchEvent;
-import java.nio.file.WatchKey;
+import java.nio.file.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/src/client/java/io/gitlab/jfronny/respackopts/mixin/ResourcePackEntryMixin.java b/src/client/java/io/gitlab/jfronny/respackopts/mixin/ResourcePackEntryMixin.java
index 57880d6..46826bf 100644
--- a/src/client/java/io/gitlab/jfronny/respackopts/mixin/ResourcePackEntryMixin.java
+++ b/src/client/java/io/gitlab/jfronny/respackopts/mixin/ResourcePackEntryMixin.java
@@ -3,7 +3,6 @@ package io.gitlab.jfronny.respackopts.mixin;
 import com.mojang.blaze3d.systems.RenderSystem;
 import io.gitlab.jfronny.libjf.config.api.v1.dsl.DSL;
 import io.gitlab.jfronny.libjf.config.api.v1.ui.tiny.ConfigScreen;
-import io.gitlab.jfronny.respackopts.RespackoptsClient;
 import io.gitlab.jfronny.respackopts.model.cache.CacheKey;
 import io.gitlab.jfronny.respackopts.util.MetaCache;
 import net.minecraft.client.MinecraftClient;
@@ -12,9 +11,7 @@ import net.minecraft.client.gui.screen.pack.PackListWidget;
 import net.minecraft.client.gui.screen.pack.ResourcePackOrganizer;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.Identifier;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.*;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
diff --git a/src/main/java/io/gitlab/jfronny/respackopts/RespackoptsConfig.java b/src/main/java/io/gitlab/jfronny/respackopts/RespackoptsConfig.java
index 01da6fa..b505772 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/RespackoptsConfig.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/RespackoptsConfig.java
@@ -3,7 +3,6 @@ package io.gitlab.jfronny.respackopts;
 import io.gitlab.jfronny.libjf.config.api.v1.ConfigInstance;
 import io.gitlab.jfronny.libjf.config.api.v1.JfCustomConfig;
 import io.gitlab.jfronny.libjf.config.api.v1.dsl.DSL;
-import io.gitlab.jfronny.respackopts.Respackopts;
 import io.gitlab.jfronny.respackopts.util.MetaCache;
 
 import java.util.LinkedList;
diff --git a/src/main/java/io/gitlab/jfronny/respackopts/filters/FileFilterEvents.java b/src/main/java/io/gitlab/jfronny/respackopts/filters/FileFilterEvents.java
index 70f5f90..0ea4ec0 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/filters/FileFilterEvents.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/filters/FileFilterEvents.java
@@ -3,16 +3,15 @@ package io.gitlab.jfronny.respackopts.filters;
 import io.gitlab.jfronny.libjf.ResourcePath;
 import io.gitlab.jfronny.libjf.data.manipulation.api.UserResourceEvents;
 import io.gitlab.jfronny.respackopts.Respackopts;
-import io.gitlab.jfronny.respackopts.util.MetaCache;
+import io.gitlab.jfronny.respackopts.filters.util.*;
 import io.gitlab.jfronny.respackopts.model.enums.PackCapability;
-import io.gitlab.jfronny.respackopts.filters.util.FileExclusionProvider;
-import io.gitlab.jfronny.respackopts.filters.util.FileExpansionProvider;
-import io.gitlab.jfronny.respackopts.filters.util.FileFallbackProvider;
+import io.gitlab.jfronny.respackopts.util.MetaCache;
 import net.minecraft.resource.*;
 import net.minecraft.util.Identifier;
 
 import java.io.InputStream;
-import java.util.*;
+import java.util.HashSet;
+import java.util.Set;
 
 public enum FileFilterEvents implements UserResourceEvents.OpenRoot, UserResourceEvents.Open, UserResourceEvents.FindResource {
     INSTANCE;
diff --git a/src/main/java/io/gitlab/jfronny/respackopts/filters/util/FileExclusionProvider.java b/src/main/java/io/gitlab/jfronny/respackopts/filters/util/FileExclusionProvider.java
index 0804103..226dda3 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/filters/util/FileExclusionProvider.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/filters/util/FileExclusionProvider.java
@@ -1,11 +1,11 @@
 package io.gitlab.jfronny.respackopts.filters.util;
 
-import io.gitlab.jfronny.muscript.debug.*;
-import io.gitlab.jfronny.respackopts.*;
-import io.gitlab.jfronny.respackopts.model.*;
-import io.gitlab.jfronny.respackopts.model.cache.*;
-import io.gitlab.jfronny.respackopts.util.*;
-import net.minecraft.resource.*;
+import io.gitlab.jfronny.muscript.debug.ObjectGraphPrinter;
+import io.gitlab.jfronny.respackopts.Respackopts;
+import io.gitlab.jfronny.respackopts.model.Condition;
+import io.gitlab.jfronny.respackopts.model.cache.CacheKey;
+import io.gitlab.jfronny.respackopts.util.MetaCache;
+import net.minecraft.resource.ResourcePack;
 
 public class FileExclusionProvider {
     public static boolean fileHidden(ResourcePack pack, String file) {
diff --git a/src/main/java/io/gitlab/jfronny/respackopts/filters/util/FileExpansionProvider.java b/src/main/java/io/gitlab/jfronny/respackopts/filters/util/FileExpansionProvider.java
index 6c1e90f..9dd2044 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/filters/util/FileExpansionProvider.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/filters/util/FileExpansionProvider.java
@@ -1,9 +1,7 @@
 package io.gitlab.jfronny.respackopts.filters.util;
 
-import io.gitlab.jfronny.muscript.data.dynamic.Dynamic;
 import io.gitlab.jfronny.muscript.ast.StringExpr;
-import io.gitlab.jfronny.respackopts.Respackopts;
-import io.gitlab.jfronny.respackopts.RespackoptsConfig;
+import io.gitlab.jfronny.muscript.data.dynamic.Dynamic;
 import io.gitlab.jfronny.respackopts.util.MetaCache;
 import net.minecraft.resource.InputSupplier;
 import net.minecraft.resource.ResourcePack;
diff --git a/src/main/java/io/gitlab/jfronny/respackopts/gson/AttachmentHolder.java b/src/main/java/io/gitlab/jfronny/respackopts/gson/AttachmentHolder.java
index 0bbc93f..084ccc3 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/gson/AttachmentHolder.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/gson/AttachmentHolder.java
@@ -1,9 +1,10 @@
 package io.gitlab.jfronny.respackopts.gson;
 
-import io.gitlab.jfronny.commons.throwable.*;
-import io.gitlab.jfronny.respackopts.*;
+import io.gitlab.jfronny.commons.throwable.ThrowingRunnable;
+import io.gitlab.jfronny.commons.throwable.ThrowingSupplier;
+import io.gitlab.jfronny.respackopts.Respackopts;
 
-import java.io.*;
+import java.io.Reader;
 
 public class AttachmentHolder {
     private static final ThreadLocal<Attachment> attachments = new ThreadLocal<>();
diff --git a/src/main/java/io/gitlab/jfronny/respackopts/gson/BoolExprDeserializer.java b/src/main/java/io/gitlab/jfronny/respackopts/gson/BoolExprDeserializer.java
index 1832d0d..91f22ce 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/gson/BoolExprDeserializer.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/gson/BoolExprDeserializer.java
@@ -1,12 +1,12 @@
 package io.gitlab.jfronny.respackopts.gson;
 
 import io.gitlab.jfronny.gson.*;
-import io.gitlab.jfronny.gson.reflect.*;
-import io.gitlab.jfronny.muscript.ast.compare.Equal;
-import io.gitlab.jfronny.muscript.compiler.*;
+import io.gitlab.jfronny.gson.reflect.TypeToken;
 import io.gitlab.jfronny.muscript.ast.*;
 import io.gitlab.jfronny.muscript.ast.bool.*;
+import io.gitlab.jfronny.muscript.ast.compare.Equal;
 import io.gitlab.jfronny.muscript.ast.dynamic.*;
+import io.gitlab.jfronny.muscript.compiler.Token;
 
 import java.lang.reflect.Type;
 import java.util.*;
diff --git a/src/main/java/io/gitlab/jfronny/respackopts/gson/ConditionDeserializer.java b/src/main/java/io/gitlab/jfronny/respackopts/gson/ConditionDeserializer.java
index 04f6c4b..7bb333c 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/gson/ConditionDeserializer.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/gson/ConditionDeserializer.java
@@ -1,10 +1,10 @@
 package io.gitlab.jfronny.respackopts.gson;
 
 import io.gitlab.jfronny.gson.*;
-import io.gitlab.jfronny.muscript.ast.*;
-import io.gitlab.jfronny.respackopts.model.*;
+import io.gitlab.jfronny.muscript.ast.BoolExpr;
+import io.gitlab.jfronny.respackopts.model.Condition;
 
-import java.lang.reflect.*;
+import java.lang.reflect.Type;
 
 public class ConditionDeserializer implements JsonDeserializer<Condition> {
     @Override
diff --git a/src/main/java/io/gitlab/jfronny/respackopts/gson/ExprDeserializer.java b/src/main/java/io/gitlab/jfronny/respackopts/gson/ExprDeserializer.java
index fe9a977..db5665b 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/gson/ExprDeserializer.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/gson/ExprDeserializer.java
@@ -1,12 +1,13 @@
 package io.gitlab.jfronny.respackopts.gson;
 
 import io.gitlab.jfronny.gson.*;
-import io.gitlab.jfronny.muscript.*;
-import io.gitlab.jfronny.muscript.compiler.*;
-import io.gitlab.jfronny.muscript.ast.*;
+import io.gitlab.jfronny.muscript.StarScriptIngester;
+import io.gitlab.jfronny.muscript.ast.Expr;
+import io.gitlab.jfronny.muscript.compiler.Parser;
 
 import java.lang.reflect.Type;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
 
 public class ExprDeserializer implements JsonDeserializer<Expr<?>> {
     private static final Map<String, Expr<?>> compiledScripts = new HashMap<>();
diff --git a/src/main/java/io/gitlab/jfronny/respackopts/gson/StringExprDeserializer.java b/src/main/java/io/gitlab/jfronny/respackopts/gson/StringExprDeserializer.java
index f5aed8e..6d0becb 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/gson/StringExprDeserializer.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/gson/StringExprDeserializer.java
@@ -1,9 +1,10 @@
 package io.gitlab.jfronny.respackopts.gson;
 
 import io.gitlab.jfronny.gson.*;
-import io.gitlab.jfronny.muscript.ast.*;
+import io.gitlab.jfronny.muscript.ast.Expr;
+import io.gitlab.jfronny.muscript.ast.StringExpr;
 
-import java.lang.reflect.*;
+import java.lang.reflect.Type;
 
 public class StringExprDeserializer implements JsonDeserializer<StringExpr> {
     @Override
diff --git a/src/main/java/io/gitlab/jfronny/respackopts/gson/entry/ConfigBranchSerializer.java b/src/main/java/io/gitlab/jfronny/respackopts/gson/entry/ConfigBranchSerializer.java
index 776f326..773f72c 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/gson/entry/ConfigBranchSerializer.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/gson/entry/ConfigBranchSerializer.java
@@ -2,8 +2,8 @@ package io.gitlab.jfronny.respackopts.gson.entry;
 
 import io.gitlab.jfronny.gson.*;
 import io.gitlab.jfronny.respackopts.Respackopts;
-import io.gitlab.jfronny.respackopts.model.tree.*;
 import io.gitlab.jfronny.respackopts.model.enums.PackReloadType;
+import io.gitlab.jfronny.respackopts.model.tree.*;
 
 import java.lang.reflect.Type;
 import java.util.Map;
diff --git a/src/main/java/io/gitlab/jfronny/respackopts/mixin/ResourcePackManagerMixin.java b/src/main/java/io/gitlab/jfronny/respackopts/mixin/ResourcePackManagerMixin.java
index 425de61..b61ee7c 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/mixin/ResourcePackManagerMixin.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/mixin/ResourcePackManagerMixin.java
@@ -1,25 +1,21 @@
 package io.gitlab.jfronny.respackopts.mixin;
 
+import io.gitlab.jfronny.respackopts.Respackopts;
 import io.gitlab.jfronny.respackopts.RespackoptsConfig;
 import io.gitlab.jfronny.respackopts.integration.SaveHook;
+import io.gitlab.jfronny.respackopts.model.PackMeta;
 import io.gitlab.jfronny.respackopts.model.cache.CacheKey;
 import io.gitlab.jfronny.respackopts.util.MetaCache;
-import io.gitlab.jfronny.respackopts.Respackopts;
-import io.gitlab.jfronny.respackopts.model.PackMeta;
 import net.minecraft.resource.*;
 import net.minecraft.util.Identifier;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.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.io.*;
 import java.nio.file.Path;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 @Mixin(ResourcePackManager.class)
 public class ResourcePackManagerMixin {
diff --git a/src/main/java/io/gitlab/jfronny/respackopts/model/DirRpo.java b/src/main/java/io/gitlab/jfronny/respackopts/model/DirRpo.java
index 1cef3ae..100bf8e 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/model/DirRpo.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/model/DirRpo.java
@@ -1,7 +1,7 @@
 package io.gitlab.jfronny.respackopts.model;
 
-import io.gitlab.jfronny.commons.serialize.gson.api.*;
-import io.gitlab.jfronny.gson.annotations.*;
+import io.gitlab.jfronny.commons.serialize.gson.api.Ignore;
+import io.gitlab.jfronny.gson.annotations.SerializedName;
 
 public class DirRpo {
     @SerializedName(value = "condition", alternate = {"conditions"})
diff --git a/src/main/java/io/gitlab/jfronny/respackopts/model/FileRpo.java b/src/main/java/io/gitlab/jfronny/respackopts/model/FileRpo.java
index 4436b86..c4bdd39 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/model/FileRpo.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/model/FileRpo.java
@@ -1,10 +1,11 @@
 package io.gitlab.jfronny.respackopts.model;
 
-import io.gitlab.jfronny.commons.serialize.gson.api.*;
-import io.gitlab.jfronny.gson.annotations.*;
-import io.gitlab.jfronny.muscript.ast.*;
+import io.gitlab.jfronny.commons.serialize.gson.api.Ignore;
+import io.gitlab.jfronny.gson.annotations.SerializedName;
+import io.gitlab.jfronny.muscript.ast.StringExpr;
 
-import java.util.*;
+import java.util.Map;
+import java.util.Set;
 
 public class FileRpo {
     @SerializedName(value = "condition", alternate = {"conditions"})
diff --git a/src/main/java/io/gitlab/jfronny/respackopts/model/PackMeta.java b/src/main/java/io/gitlab/jfronny/respackopts/model/PackMeta.java
index a6b89d7..82b0df6 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/model/PackMeta.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/model/PackMeta.java
@@ -1,7 +1,7 @@
 package io.gitlab.jfronny.respackopts.model;
 
-import io.gitlab.jfronny.respackopts.model.tree.ConfigBranch;
 import io.gitlab.jfronny.respackopts.model.enums.PackCapability;
+import io.gitlab.jfronny.respackopts.model.tree.ConfigBranch;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/src/main/java/io/gitlab/jfronny/respackopts/model/tree/ConfigBooleanEntry.java b/src/main/java/io/gitlab/jfronny/respackopts/model/tree/ConfigBooleanEntry.java
index b7d4a62..c7551f8 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/model/tree/ConfigBooleanEntry.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/model/tree/ConfigBooleanEntry.java
@@ -1,7 +1,7 @@
 package io.gitlab.jfronny.respackopts.model.tree;
 
-import io.gitlab.jfronny.muscript.data.dynamic.DBool;
 import io.gitlab.jfronny.libjf.config.api.v1.dsl.CategoryBuilder;
+import io.gitlab.jfronny.muscript.data.dynamic.DBool;
 import io.gitlab.jfronny.respackopts.Respackopts;
 import io.gitlab.jfronny.respackopts.RespackoptsConfig;
 
diff --git a/src/main/java/io/gitlab/jfronny/respackopts/model/tree/ConfigBranch.java b/src/main/java/io/gitlab/jfronny/respackopts/model/tree/ConfigBranch.java
index 0fc4e88..611cbce 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/model/tree/ConfigBranch.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/model/tree/ConfigBranch.java
@@ -1,13 +1,13 @@
 package io.gitlab.jfronny.respackopts.model.tree;
 
 import com.google.common.collect.ImmutableMap;
-import io.gitlab.jfronny.muscript.data.dynamic.*;
 import io.gitlab.jfronny.gson.reflect.TypeToken;
 import io.gitlab.jfronny.libjf.config.api.v1.dsl.CategoryBuilder;
 import io.gitlab.jfronny.libjf.config.api.v1.dsl.ConfigBuilder;
+import io.gitlab.jfronny.muscript.data.dynamic.*;
 import io.gitlab.jfronny.respackopts.Respackopts;
-import io.gitlab.jfronny.respackopts.integration.SaveHook;
 import io.gitlab.jfronny.respackopts.RespackoptsConfig;
+import io.gitlab.jfronny.respackopts.integration.SaveHook;
 import io.gitlab.jfronny.respackopts.model.enums.ConfigSyncMode;
 import io.gitlab.jfronny.respackopts.model.enums.PackReloadType;
 import io.gitlab.jfronny.respackopts.util.IndentingStringBuilder;
diff --git a/src/main/java/io/gitlab/jfronny/respackopts/model/tree/ConfigEntry.java b/src/main/java/io/gitlab/jfronny/respackopts/model/tree/ConfigEntry.java
index d69e425..5272730 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/model/tree/ConfigEntry.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/model/tree/ConfigEntry.java
@@ -1,7 +1,7 @@
 package io.gitlab.jfronny.respackopts.model.tree;
 
-import io.gitlab.jfronny.muscript.data.dynamic.Dynamic;
 import io.gitlab.jfronny.libjf.config.api.v1.dsl.CategoryBuilder;
+import io.gitlab.jfronny.muscript.data.dynamic.Dynamic;
 import io.gitlab.jfronny.respackopts.Respackopts;
 import io.gitlab.jfronny.respackopts.model.enums.ConfigSyncMode;
 import io.gitlab.jfronny.respackopts.model.enums.PackReloadType;
diff --git a/src/main/java/io/gitlab/jfronny/respackopts/model/tree/ConfigEnumEntry.java b/src/main/java/io/gitlab/jfronny/respackopts/model/tree/ConfigEnumEntry.java
index 13c08ab..41cd307 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/model/tree/ConfigEnumEntry.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/model/tree/ConfigEnumEntry.java
@@ -1,7 +1,7 @@
 package io.gitlab.jfronny.respackopts.model.tree;
 
-import io.gitlab.jfronny.muscript.data.dynamic.DEnum;
 import io.gitlab.jfronny.libjf.config.api.v1.dsl.CategoryBuilder;
+import io.gitlab.jfronny.muscript.data.dynamic.DEnum;
 import io.gitlab.jfronny.respackopts.Respackopts;
 import io.gitlab.jfronny.respackopts.RespackoptsConfig;
 import io.gitlab.jfronny.respackopts.model.enums.ConfigSyncMode;
diff --git a/src/main/java/io/gitlab/jfronny/respackopts/model/tree/ConfigNumericEntry.java b/src/main/java/io/gitlab/jfronny/respackopts/model/tree/ConfigNumericEntry.java
index c38a10b..80e321f 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/model/tree/ConfigNumericEntry.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/model/tree/ConfigNumericEntry.java
@@ -1,7 +1,7 @@
 package io.gitlab.jfronny.respackopts.model.tree;
 
-import io.gitlab.jfronny.muscript.data.dynamic.DNumber;
 import io.gitlab.jfronny.libjf.config.api.v1.dsl.CategoryBuilder;
+import io.gitlab.jfronny.muscript.data.dynamic.DNumber;
 import io.gitlab.jfronny.respackopts.Respackopts;
 import io.gitlab.jfronny.respackopts.RespackoptsConfig;
 import io.gitlab.jfronny.respackopts.model.enums.ConfigSyncMode;
diff --git a/src/main/java/io/gitlab/jfronny/respackopts/util/MuUtils.java b/src/main/java/io/gitlab/jfronny/respackopts/util/MuUtils.java
index 6fc92cc..754a28c 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/util/MuUtils.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/util/MuUtils.java
@@ -1,8 +1,8 @@
 package io.gitlab.jfronny.respackopts.util;
 
-import io.gitlab.jfronny.muscript.data.dynamic.*;
 import io.gitlab.jfronny.muscript.StandardLib;
 import io.gitlab.jfronny.muscript.data.Scope;
+import io.gitlab.jfronny.muscript.data.dynamic.*;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.VersionParsingException;
 import net.fabricmc.loader.api.metadata.version.VersionPredicate;
diff --git a/src/test/java/io/gitlab/jfronny/respackopts/test/TestArgs.java b/src/test/java/io/gitlab/jfronny/respackopts/test/TestArgs.java
index f85e18d..1013bc4 100644
--- a/src/test/java/io/gitlab/jfronny/respackopts/test/TestArgs.java
+++ b/src/test/java/io/gitlab/jfronny/respackopts/test/TestArgs.java
@@ -1,6 +1,7 @@
 package io.gitlab.jfronny.respackopts.test;
 
-import io.gitlab.jfronny.gson.*;
+import io.gitlab.jfronny.gson.Gson;
+import io.gitlab.jfronny.gson.GsonBuilder;
 import io.gitlab.jfronny.muscript.ast.*;
 import io.gitlab.jfronny.respackopts.gson.*;
 import io.gitlab.jfronny.respackopts.gson.entry.*;