diff --git a/build.gradle b/build.gradle
index 9c0527a..23e431b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'fabric-loom' version '1.7-SNAPSHOT'
     id 'maven-publish'
-    id 'me.fallenbreath.yamlang' version '1.3.0'
     id "org.quiltmc.gradle.licenser" version "2.0.1"
 }
 
@@ -60,11 +59,6 @@ loom {
     accessWidenerPath = file("src/main/resources/skinshuffle.accesswidener")
 }
 
-yamlang {
-    targetSourceSets = [sourceSets.main]
-    inputDir = 'assets/skinshuffle/lang'
-}
-
 dependencies {
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings "net.fabricmc:yarn:${project.'deps.yarn'}:v2"
@@ -94,8 +88,8 @@ processResources {
 
     filesMatching("fabric.mod.json") {
         expand "version": project.version,
-                "minecraft_version": project.minecraft_version,
-                "loader_version": project.'deps.loader'
+                "loader_version": project.'deps.loader',
+                "target_minecraft": project.'mod.target'
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 6b78d02..9d8b0fb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,6 +6,7 @@ minecraft_version=1.20.1
 deps.yarn=1.20.1+build.10
 deps.loader=0.15.11
 # Mod Properties
+mod.target=>=1.20 <=1.20.1
 mod.version=2.0.0+1.20.1
 mod.name=SkinShuffle
 # Dependencies
diff --git a/src/main/java/com/mineblock11/skinshuffle/util/NetworkingUtil.java b/src/main/java/com/mineblock11/skinshuffle/util/NetworkingUtil.java
index 5c803b8..b8bb1ff 100644
--- a/src/main/java/com/mineblock11/skinshuffle/util/NetworkingUtil.java
+++ b/src/main/java/com/mineblock11/skinshuffle/util/NetworkingUtil.java
@@ -44,7 +44,7 @@ public static void handleReconnect(MinecraftClient client) {
 
         if (isSingleplayer) {
             serverAddress = null;
-            folderName = client.server.getSavePath(WorldSavePath.ROOT).toFile().getName();
+            folderName = client.getServer().getSavePath(WorldSavePath.ROOT).toFile().getName();
             client.world.disconnect();
             client.disconnect(new MessageScreen(Text.translatable("skinshuffle.reconnect.rejoining")));
         } else {
diff --git a/src/main/resources/assets/skinshuffle/lang/en_us.json b/src/main/resources/assets/skinshuffle/lang/en_us.json
new file mode 100644
index 0000000..0fe274c
--- /dev/null
+++ b/src/main/resources/assets/skinshuffle/lang/en_us.json
@@ -0,0 +1,101 @@
+{
+  "skinshuffle.indicator": "Warning Indicator",
+  "skinshuffle.cape_provider.none": "None",
+  "skinshuffle.cape_provider.default": "Automatic",
+  "skinshuffle.cape_provider.minecraft": "Mojang",
+  "skinshuffle.cape_provider.optifine": "OptiFine",
+  "skinshuffle.cape_provider.minecraftcapes": "MinecraftCapes",
+  "skinshuffle.reconnect.warning": "You must %s to allow other players, including yourself, to see your skin.",
+  "skinshuffle.reconnect.reconnecting": "Reconnecting...",
+  "skinshuffle.reconnect.rejoining": "Rejoining...",
+  "skinshuffle.reconnect.rejoin": "rejoin",
+  "skinshuffle.reconnect.c_rejoin": "Rejoin",
+  "skinshuffle.reconnect.reconnect_to": "reconnect to",
+  "skinshuffle.reconnect.reconnect": "reconnect",
+  "skinshuffle.reconnect.c_reconnect": "Reconnect",
+  "skinshuffle.reconnect.world": "world",
+  "skinshuffle.reconnect.server": "server",
+  "skinshuffle.reconnect.realm": "realm",
+  "skinshuffle.reconnect.title": "%s Recommended",
+  "skinshuffle.reconnect.message": "If you want your skin to be visible to you and other players, you must %s the current %s.\n\nDo you want to %s?",
+  "skinshuffle.toasts.refused_reconnect.title": "Skin is not visible to others.",
+  "skinshuffle.toasts.refused_reconnect.message": "You will have to reconnect for your skin to be visible to other players.\n§7§oYou can disable this toast in the config.",
+  "skinshuffle.toasts.offline.title": "SkinShuffle cannot apply your skin.",
+  "skinshuffle.toasts.offline.message": "You are not authenticated, your skin will only be visible to you.\n§7§oYou can disable this toast in the config.",
+  "skinshuffle.toasts.editor_failure.title": "There was a failure with the editor.",
+  "skinshuffle.toasts.editor_failure.message": "Please check logs for more information.",
+  "skinshuffle.config.title": "SkinShuffle",
+  "skinshuffle.config.popups.title": "Popup Options",
+  "skinshuffle.config.popups.description": "Configuration options regarding toasts and other popups that appear in-game in certain circumstances.",
+  "skinshuffle.config.popups.reconnect.name": "Disable Skin Visibility Toast",
+  "skinshuffle.config.popups.reconnect.description": "Disable the toast that appears when you do not reconnect after changing your skin.\n\nThis only shows on servers without the mod installed.",
+  "skinshuffle.config.general.title": "General Options",
+  "skinshuffle.config.general.description": "General configuration options that change or toggle functionality.",
+  "skinshuffle.config.general.behaviour.title": "Behaviour",
+  "skinshuffle.config.general.display.title": "Display",
+  "skinshuffle.config.general.disable_api.name": "Disable Mojang API Uploading",
+  "skinshuffle.config.general.disable_api.description": "Should SkinShuffle not upload your skin to the Mojang API?\n\nIf enabled, this will mean that your skin will not be visible to yourself or other players.",
+  "skinshuffle.config.general.display_title_screen.name": "Display Widget In Title Screen",
+  "skinshuffle.config.general.display_title_screen.description": "Should the currently selected skin preset and the skin preset button be shown on the title screen?",
+  "skinshuffle.config.general.display_pause_screen.name": "Display Widget In Pause Screen",
+  "skinshuffle.config.general.display_pause_screen.description": "Should the currently selected skin preset and the skin preset button be shown on the pause screen?",
+  "skinshuffle.config.general.carousel_scroll_sensitivity.name": "Carousel Scroll Sensitivity",
+  "skinshuffle.config.general.carousel_scroll_sensitivity.description": "How sensitive should the carousel be to mouse scrolling?",
+  "skinshuffle.config.general.invert_carousel_scroll.name": "Invert Carousel Scroll",
+  "skinshuffle.config.general.invert_carousel_scroll.description": "Should the carousel scroll direction be inverted?",
+  "skinshuffle.config.rendering.title": "Rendering Options",
+  "skinshuffle.config.rendering.description": "Configuration options regarding how skin presets are rendered in the title screen, pause menu, carousel and edit screens.",
+  "skinshuffle.config.rendering.rotation": "Rotation",
+  "skinshuffle.config.rendering.cursor": "Cursor",
+  "skinshuffle.config.rendering.render_player_capes.name": "Render Player Capes",
+  "skinshuffle.config.rendering.render_player_capes.description": "Should SkinShuffle render player capes from Mojang, Optifine and Minecraft Capes providers?",
+  "skinshuffle.config.rendering.rendering_style": "§lROTATION§r rotates the rendered player at a fixed rate specified by the rotation speed multiplier.\n§lCURSOR§r makes the rendered player look at the mouse cursor at all times, similarly to the inventory screen.",
+  "skinshuffle.config.rendering.carousel_rendering_style.name": "Carousel Rendering Style",
+  "skinshuffle.config.rendering.carousel_rendering_style.description": "How should the currently selected skin preset be rendered in the carousel screen?\n",
+  "skinshuffle.config.rendering.preset_edit_screen_rendering_style.name": "Preview Rendering Style",
+  "skinshuffle.config.rendering.preset_edit_screen_rendering_style.description": "How should the skin preview be rendered in the preset edit screen?\n",
+  "skinshuffle.config.rendering.widget_rendering_style.name": "Widget Rendering Style",
+  "skinshuffle.config.rendering.widget_rendering_style.description": "How should the widget on the title screen and pause screen be rendered?\n",
+  "skinshuffle.config.rendering.rotation_speed.name": "Rotation Speed Multiplier",
+  "skinshuffle.config.rendering.rotation_speed.description": "What rotation speed multiplier should be applied to skins if rotation is enabled?",
+  "skinshuffle.button": "Skin Presets",
+  "skinshuffle.carousel.title": "Skin Presets",
+  "skinshuffle.carousel.config_button.tooltip": "Open the config screen.",
+  "skinshuffle.carousel.view_type_button.large.tooltip": "Large view.",
+  "skinshuffle.carousel.view_type_button.compact.tooltip": "Compact view.",
+  "skinshuffle.carousel.shuffle_button.tooltip.enable": "Enable shuffling.",
+  "skinshuffle.carousel.shuffle_button.tooltip.disable": "Disable shuffling.",
+  "skinshuffle.carousel.default_tooltip": "§4You cannot modify or copy the default preset.",
+  "skinshuffle.carousel.create": "Create",
+  "skinshuffle.carousel.new": "New Preset",
+  "skinshuffle.carousel.save_button": "Select Preset",
+  "skinshuffle.carousel.left": "Move Carousel Left",
+  "skinshuffle.carousel.right": "Move Carousel Right",
+  "skinshuffle.carousel.confirmations.delete_preset.title": "Preset Deletion",
+  "skinshuffle.carousel.confirmations.delete_preset.message": "Are you sure you want to delete this preset?\nIt will be lost forever! (A long time!)",
+  "skinshuffle.carousel.preset_widget.edit": "Edit",
+  "skinshuffle.carousel.preset_widget.copy": "Copy",
+  "skinshuffle.carousel.preset_widget.delete": "Delete",
+  "skinshuffle.carousel.preset_widget.select": "Select",
+  "skinshuffle.edit.customize.title": "Preset Settings",
+  "skinshuffle.edit.customize.default": "Classic",
+  "skinshuffle.edit.customize.slim": "Slim",
+  "skinshuffle.edit.customize.model_cycle_prefix": "Model Type",
+  "skinshuffle.edit.customize.preset_name": "Preset Name",
+  "skinshuffle.edit.customize.cape_provider": "Cape Provider",
+  "skinshuffle.edit.source.username": "Username",
+  "skinshuffle.edit.source.invalid_username": "§4§nInvalid Username§r\n\nUsername must only contain a-Z 0-9.\nUsername may contain underscores.\nUsername must be between 3-16 characters long.\nUsername must exist.",
+  "skinshuffle.edit.source.file": "File",
+  "skinshuffle.edit.source.invalid_file": "§4§nInvalid File§r\n\nFile must exist and must be in \nthe §l.png§r format.",
+  "skinshuffle.edit.source.url": "URL",
+  "skinshuffle.edit.source.invalid_url": "§4§nInvalid URL§r\n\nURL is invalid. Must be either a \nvalid §lhttp§r or §lhttps§r URL.",
+  "skinshuffle.edit.source.uuid": "UUID",
+  "skinshuffle.edit.source.invalid_uuid": "§4§nInvalid UUID§r\n\nUUID must be in the following format:\n§lxxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+  "skinshuffle.edit.source.resource_location": "Resource Location",
+  "skinshuffle.edit.source.invalid_resource_location": "§4§nInvalid Resource Location§r\n\nResource location must be a valid\ntexture file that is loaded by the game.",
+  "skinshuffle.edit.source.unchanged": "Keep Current",
+  "skinshuffle.edit.source.cycle_prefix": "Source",
+  "skinshuffle.edit.source.title": "Skin Source",
+  "skinshuffle.edit.source.skin_model": "Skin Model",
+  "skinshuffle.edit.source.load_skin": "Load Skin"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/skinshuffle/lang/en_us.yml b/src/main/resources/assets/skinshuffle/lang/en_us.yml
deleted file mode 100644
index 1ca35b2..0000000
--- a/src/main/resources/assets/skinshuffle/lang/en_us.yml
+++ /dev/null
@@ -1,171 +0,0 @@
-skinshuffle:
-  indicator: "Warning Indicator"
-  cape_provider:
-    none: "None"
-    default: "Automatic"
-    minecraft: "Mojang"
-    optifine: "OptiFine"
-    minecraftcapes: "MinecraftCapes"
-  reconnect:
-    warning: "You must %s to allow other players, including yourself, to see your skin."
-    reconnecting: Reconnecting...
-    rejoining: Rejoining...
-    rejoin: rejoin
-    c_rejoin: Rejoin
-    reconnect_to: reconnect to
-    reconnect: reconnect
-    c_reconnect: Reconnect
-    world: world
-    server: server
-    realm: realm
-    title: "%s Recommended"
-    message: |-
-      If you want your skin to be visible to you and other players, you must %s the current %s.
-      
-      Do you want to %s?
-  toasts:
-    refused_reconnect:
-      title: "Skin is not visible to others."
-      message: |-
-        You will have to reconnect for your skin to be visible to other players.
-        §7§oYou can disable this toast in the config.
-    offline:
-      title: "SkinShuffle cannot apply your skin."
-      message: |-
-        You are not authenticated, your skin will only be visible to you.
-        §7§oYou can disable this toast in the config.
-    editor_failure:
-      title: "There was a failure with the editor."
-      message: "Please check logs for more information."
-  config:
-    title: "SkinShuffle"
-    popups:
-      title: "Popup Options"
-      description: "Configuration options regarding toasts and other popups that appear in-game in certain circumstances."
-      reconnect:
-        name: "Disable Skin Visibility Toast"
-        description: "Disable the toast that appears when you do not reconnect after changing your skin.\n\nThis only shows on servers without the mod installed."
-    general:
-      title: "General Options"
-      description: "General configuration options that change or toggle functionality."
-
-      behaviour.title: "Behaviour"
-      display.title: "Display"
-      disable_api:
-        name: "Disable Mojang API Uploading"
-        description: |-
-          Should SkinShuffle not upload your skin to the Mojang API?
-
-          If enabled, this will mean that your skin will not be visible to yourself or other players.
-      display_title_screen:
-        name: "Display Widget In Title Screen"
-        description: "Should the currently selected skin preset and the skin preset button be shown on the title screen?"
-      display_pause_screen:
-        name: "Display Widget In Pause Screen"
-        description: "Should the currently selected skin preset and the skin preset button be shown on the pause screen?"
-      carousel_scroll_sensitivity:
-        name: "Carousel Scroll Sensitivity"
-        description: "How sensitive should the carousel be to mouse scrolling?"
-      invert_carousel_scroll:
-        name: "Invert Carousel Scroll"
-        description: "Should the carousel scroll direction be inverted?"
-    rendering:
-      title: "Rendering Options"
-      description: "Configuration options regarding how skin presets are rendered in the title screen, pause menu, carousel and edit screens."
-      rotation: "Rotation"
-      cursor: "Cursor"
-      render_player_capes:
-        name: "Render Player Capes"
-        description: "Should SkinShuffle render player capes from Mojang, Optifine and Minecraft Capes providers?"
-      rendering_style: |-
-        §lROTATION§r rotates the rendered player at a fixed rate specified by the rotation speed multiplier.
-        §lCURSOR§r makes the rendered player look at the mouse cursor at all times, similarly to the inventory screen.
-      carousel_rendering_style:
-        name: "Carousel Rendering Style"
-        description: "How should the currently selected skin preset be rendered in the carousel screen?\n"
-      preset_edit_screen_rendering_style:
-        name: "Preview Rendering Style"
-        description: "How should the skin preview be rendered in the preset edit screen?\n"
-      widget_rendering_style:
-        name: "Widget Rendering Style"
-        description: "How should the widget on the title screen and pause screen be rendered?\n"
-      rotation_speed:
-        name: "Rotation Speed Multiplier"
-        description: "What rotation speed multiplier should be applied to skins if rotation is enabled?"
-  button: "Skin Presets"
-  carousel:
-    title: "Skin Presets"
-
-    config_button.tooltip: "Open the config screen."
-    view_type_button.large.tooltip: "Large view."
-    view_type_button.compact.tooltip: "Compact view."
-    shuffle_button.tooltip.enable: "Enable shuffling."
-    shuffle_button.tooltip.disable: "Disable shuffling."
-
-    default_tooltip: "§4You cannot modify or copy the default preset."
-
-    create: "Create"
-    new: "New Preset"
-    save_button: "Select Preset"
-
-    # These are used for narrations.
-    left: "Move Carousel Left"
-    right: "Move Carousel Right"
-
-    confirmations:
-      delete_preset:
-        title: "Preset Deletion"
-        message: "Are you sure you want to delete this preset?\nIt will be lost forever! (A long time!)"
-
-    preset_widget:
-      edit: "Edit"
-      copy: "Copy"
-      delete: "Delete"
-      select: "Select"
-
-  edit:
-    customize:
-      title: "Preset Settings"
-      default: "Classic"
-      slim: "Slim"
-      model_cycle_prefix: "Model Type"
-      preset_name: "Preset Name"
-      cape_provider: "Cape Provider"
-    source:
-      username: "Username"
-      invalid_username: |-
-        §4§nInvalid Username§r
-        
-        Username must only contain a-Z 0-9.
-        Username may contain underscores.
-        Username must be between 3-16 characters long.
-        Username must exist.
-      file: "File"
-      invalid_file: |-
-        §4§nInvalid File§r
-        
-        File must exist and must be in 
-        the §l.png§r format.
-      url: "URL"
-      invalid_url: |-
-        §4§nInvalid URL§r
-        
-        URL is invalid. Must be either a 
-        valid §lhttp§r or §lhttps§r URL.
-      uuid: "UUID"
-      invalid_uuid: |-
-        §4§nInvalid UUID§r
-        
-        UUID must be in the following format:
-        §lxxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-      resource_location: "Resource Location"
-      invalid_resource_location: |-
-        §4§nInvalid Resource Location§r
-      
-        Resource location must be a valid
-        texture file that is loaded by the game.
-      unchanged: "Keep Current"
-      cycle_prefix: "Source"
-      title: "Skin Source"
-      skin_model: "Skin Model"
-      load_skin: "Load Skin"
\ No newline at end of file
diff --git a/src/main/resources/assets/skinshuffle/lang/zh_cn.json b/src/main/resources/assets/skinshuffle/lang/zh_cn.json
new file mode 100644
index 0000000..5378f35
--- /dev/null
+++ b/src/main/resources/assets/skinshuffle/lang/zh_cn.json
@@ -0,0 +1,101 @@
+{
+  "skinshuffle.indicator": "警告指示器",
+  "skinshuffle.cape_provider.none": "无",
+  "skinshuffle.cape_provider.default": "自动",
+  "skinshuffle.cape_provider.minecraft": "Mojang",
+  "skinshuffle.cape_provider.optifine": "OptiFine",
+  "skinshuffle.cape_provider.minecraftcapes": "MinecraftCapes",
+  "skinshuffle.reconnect.warning": "你需要 %s 以允许包括自身的玩家看见你的皮肤。",
+  "skinshuffle.reconnect.reconnecting": "重新连接中...",
+  "skinshuffle.reconnect.rejoining": "重新加入中...",
+  "skinshuffle.reconnect.rejoin": "重新加入",
+  "skinshuffle.reconnect.c_rejoin": "重新加入",
+  "skinshuffle.reconnect.reconnect_to": "重新连接至",
+  "skinshuffle.reconnect.reconnect": "重新连接",
+  "skinshuffle.reconnect.c_reconnect": "重新连接",
+  "skinshuffle.reconnect.world": "世界",
+  "skinshuffle.reconnect.server": "服务器",
+  "skinshuffle.reconnect.realm": "Realm",
+  "skinshuffle.reconnect.title": "建议 %s",
+  "skinshuffle.reconnect.message": "如果你想要你的皮肤对他人可见，你需要 %s 当前的 %s。\n\n是否 %s？",
+  "skinshuffle.toasts.refused_reconnect.title": "皮肤对他人不可见。",
+  "skinshuffle.toasts.refused_reconnect.message": "你必须重新连接才能使其他人看到你的皮肤。\n§7§o你可以在配置里关闭该弹窗。",
+  "skinshuffle.toasts.offline.title": "SkinShuffle无法应用你的皮肤。",
+  "skinshuffle.toasts.offline.message": "你没有登陆，皮肤仅对自己可见。\n§7§o你可以在配置里关闭该弹窗。",
+  "skinshuffle.toasts.editor_failure.title": "编辑器发生错误。",
+  "skinshuffle.toasts.editor_failure.message": "请检查日志以获取更多信息。",
+  "skinshuffle.config.title": "SkinShuffle",
+  "skinshuffle.config.popups.title": "弹窗设置",
+  "skinshuffle.config.popups.description": "有关在游戏内某些情况下通知或弹窗弹出的设置。",
+  "skinshuffle.config.popups.reconnect.name": "禁用皮肤可见性弹窗",
+  "skinshuffle.config.popups.reconnect.description": "禁用在你更换皮肤后没有重连时弹窗的弹出。\n\n该提示仅显示在未安装本模组的服务器上。",
+  "skinshuffle.config.general.title": "总选项",
+  "skinshuffle.config.general.description": "更改或切换功能的总选项。",
+  "skinshuffle.config.general.behaviour.title": "行为",
+  "skinshuffle.config.general.display.title": "显示",
+  "skinshuffle.config.general.disable_api.name": "禁用 Mojang API 上传",
+  "skinshuffle.config.general.disable_api.description": "SkinShuffle 是否不将皮肤上传至 Mojang API？\n\n如果启用，意味着你的皮肤将对你自己或他人不可见。",
+  "skinshuffle.config.general.display_title_screen.name": "主菜单显示控件",
+  "skinshuffle.config.general.display_title_screen.description": "是否在主菜单显示当前所选皮肤预设与皮肤预设按钮？",
+  "skinshuffle.config.general.display_pause_screen.name": "暂停菜单显示控件",
+  "skinshuffle.config.general.display_pause_screen.description": "是否在主菜单显示当前所选皮肤预设与皮肤预设按钮？",
+  "skinshuffle.config.general.carousel_scroll_sensitivity.name": "纸娃娃滚动灵敏度",
+  "skinshuffle.config.general.carousel_scroll_sensitivity.description": "纸娃娃被滚动时的灵敏度？",
+  "skinshuffle.config.general.invert_carousel_scroll.name": "反转纸娃娃滚动方向",
+  "skinshuffle.config.general.invert_carousel_scroll.description": "是否反转纸娃娃被滚动时的方向?",
+  "skinshuffle.config.rendering.title": "渲染选项",
+  "skinshuffle.config.rendering.description": "有关皮肤预设在主菜单、暂停菜单、纸娃娃和编辑界面如何渲染的配置。",
+  "skinshuffle.config.rendering.rotation": "旋转",
+  "skinshuffle.config.rendering.cursor": "光标",
+  "skinshuffle.config.rendering.render_player_capes.name": "渲染玩家披风",
+  "skinshuffle.config.rendering.render_player_capes.description": "SkinShuffle 是否要渲染来自 Mojang、Optifine 和 Minecraft Capes 的披风？",
+  "skinshuffle.config.rendering.rendering_style": "§l旋转§r 以由“旋转倍速”所决定的固定速度旋转。\n§l光标§r 使被渲染的玩家始终看向玩家光标，类似于物品栏内。",
+  "skinshuffle.config.rendering.carousel_rendering_style.name": "纸娃娃渲染样式",
+  "skinshuffle.config.rendering.carousel_rendering_style.description": "如何渲染在纸娃娃页面内的当前所选皮肤预设？\n",
+  "skinshuffle.config.rendering.preset_edit_screen_rendering_style.name": "预览渲染样式",
+  "skinshuffle.config.rendering.preset_edit_screen_rendering_style.description": "如何渲染在预设编辑页面的当前预览？\n",
+  "skinshuffle.config.rendering.widget_rendering_style.name": "控件渲染样式",
+  "skinshuffle.config.rendering.widget_rendering_style.description": "如何渲染在主菜单或暂停菜单的控件？\n",
+  "skinshuffle.config.rendering.rotation_speed.name": "旋转倍速",
+  "skinshuffle.config.rendering.rotation_speed.description": "如果皮肤旋转开启它将被运用多少的旋转倍速？",
+  "skinshuffle.button": "皮肤预设",
+  "skinshuffle.carousel.title": "皮肤预设",
+  "skinshuffle.carousel.config_button.tooltip": "打开配置。",
+  "skinshuffle.carousel.view_type_button.large.tooltip": "宽松视图。",
+  "skinshuffle.carousel.view_type_button.compact.tooltip": "紧凑视图。",
+  "skinshuffle.carousel.shuffle_button.tooltip.enable": "启用切换。",
+  "skinshuffle.carousel.shuffle_button.tooltip.disable": "禁用禁用切换。",
+  "skinshuffle.carousel.default_tooltip": "§4你不能修改或复制默认预设。",
+  "skinshuffle.carousel.create": "新建",
+  "skinshuffle.carousel.new": "新建预设",
+  "skinshuffle.carousel.save_button": "选择预设",
+  "skinshuffle.carousel.left": "纸娃娃向左移动",
+  "skinshuffle.carousel.right": "纸娃娃向右移动",
+  "skinshuffle.carousel.confirmations.delete_preset.title": "删除预设",
+  "skinshuffle.carousel.confirmations.delete_preset.message": "你确定要删除这个预设吗？\n它将会永久消失！（真的很久！）",
+  "skinshuffle.carousel.preset_widget.edit": "编辑",
+  "skinshuffle.carousel.preset_widget.copy": "复制",
+  "skinshuffle.carousel.preset_widget.delete": "删除",
+  "skinshuffle.carousel.preset_widget.select": "选择",
+  "skinshuffle.edit.customize.title": "预设设置",
+  "skinshuffle.edit.customize.default": "宽型",
+  "skinshuffle.edit.customize.slim": "纤细",
+  "skinshuffle.edit.customize.model_cycle_prefix": "手臂模型",
+  "skinshuffle.edit.customize.preset_name": "预设名称",
+  "skinshuffle.edit.customize.cape_provider": "披风来源",
+  "skinshuffle.edit.source.username": "无效的用户名",
+  "skinshuffle.edit.source.invalid_username": "§4§n无效的用户名§r\n\n用户名只能包含 a-Z、0-9；\n用户名可以包含下划线；\n用户名长度需为 3-16 字符；\n用户名必须存在。",
+  "skinshuffle.edit.source.file": "文件",
+  "skinshuffle.edit.source.invalid_file": "§4§n无效的文件§r\n\n文件必须存在并且为 §l.png§r 格式。",
+  "skinshuffle.edit.source.url": "URL",
+  "skinshuffle.edit.source.invalid_url": "§4§n无效的URL§r\n\nURL无效。必须为有效的 §lhttp§r 或 §lhttps§r 协议URL。",
+  "skinshuffle.edit.source.uuid": "UUID",
+  "skinshuffle.edit.source.invalid_uuid": "§4§n无效的UUID§r\n\nUUID需为以下格式：\n§lxxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+  "skinshuffle.edit.source.resource_location": "资源位置",
+  "skinshuffle.edit.source.invalid_resource_location": "§4§n无效的资源位置§r\n\n资源位置需为已被游戏加载且有效的纹理文件。",
+  "skinshuffle.edit.source.unchanged": "保持现状",
+  "skinshuffle.edit.source.cycle_prefix": "源",
+  "skinshuffle.edit.source.title": "皮肤源",
+  "skinshuffle.edit.source.skin_model": "皮肤模型",
+  "skinshuffle.edit.source.load_skin": "加载皮肤"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/skinshuffle/lang/zh_cn.yml b/src/main/resources/assets/skinshuffle/lang/zh_cn.yml
deleted file mode 100644
index 8696aff..0000000
--- a/src/main/resources/assets/skinshuffle/lang/zh_cn.yml
+++ /dev/null
@@ -1,168 +0,0 @@
-skinshuffle:
-  indicator: "警告指示器"
-  cape_provider:
-    none: "无"
-    default: "自动"
-    minecraft: "Mojang"
-    optifine: "OptiFine"
-    minecraftcapes: "MinecraftCapes"
-  reconnect:
-    warning: "你需要 %s 以允许包括自身的玩家看见你的皮肤。"
-    reconnecting: 重新连接中...
-    rejoining: 重新加入中...
-    rejoin: 重新加入
-    c_rejoin: 重新加入
-    reconnect_to: 重新连接至
-    reconnect: 重新连接
-    c_reconnect: 重新连接
-    world: 世界
-    server: 服务器
-    realm: Realm
-    title: "建议 %s"
-    message: |-
-      如果你想要你的皮肤对他人可见，你需要 %s 当前的 %s。
-      
-      是否 %s？
-  toasts:
-    refused_reconnect:
-      title: "皮肤对他人不可见。"
-      message: |-
-        你必须重新连接才能使其他人看到你的皮肤。
-        §7§o你可以在配置里关闭该弹窗。
-    offline:
-      title: "SkinShuffle无法应用你的皮肤。"
-      message: |-
-        你没有登陆，皮肤仅对自己可见。
-        §7§o你可以在配置里关闭该弹窗。
-    editor_failure:
-      title: "编辑器发生错误。"
-      message: "请检查日志以获取更多信息。"
-  config:
-    title: "SkinShuffle"
-    popups:
-      title: "弹窗设置"
-      description: "有关在游戏内某些情况下通知或弹窗弹出的设置。"
-      reconnect:
-        name: "禁用皮肤可见性弹窗"
-        description: "禁用在你更换皮肤后没有重连时弹窗的弹出。\n\n该提示仅显示在未安装本模组的服务器上。"
-    general:
-      title: "总选项"
-      description: "更改或切换功能的总选项。"
-
-      behaviour.title: "行为"
-      display.title: "显示"
-      disable_api:
-        name: "禁用 Mojang API 上传"
-        description: |-
-          SkinShuffle 是否不将皮肤上传至 Mojang API？
-
-          如果启用，意味着你的皮肤将对你自己或他人不可见。
-      display_title_screen:
-        name: "主菜单显示控件"
-        description: "是否在主菜单显示当前所选皮肤预设与皮肤预设按钮？"
-      display_pause_screen:
-        name: "暂停菜单显示控件"
-        description: "是否在主菜单显示当前所选皮肤预设与皮肤预设按钮？"
-      carousel_scroll_sensitivity:
-        name: "纸娃娃滚动灵敏度"
-        description: "纸娃娃被滚动时的灵敏度？"
-      invert_carousel_scroll:
-        name: "反转纸娃娃滚动方向"
-        description: "是否反转纸娃娃被滚动时的方向?"
-    rendering:
-      title: "渲染选项"
-      description: "有关皮肤预设在主菜单、暂停菜单、纸娃娃和编辑界面如何渲染的配置。"
-      rotation: "旋转"
-      cursor: "光标"
-      render_player_capes:
-        name: "渲染玩家披风"
-        description: "SkinShuffle 是否要渲染来自 Mojang、Optifine 和 Minecraft Capes 的披风？"
-      rendering_style: |-
-        §l旋转§r 以由“旋转倍速”所决定的固定速度旋转。
-        §l光标§r 使被渲染的玩家始终看向玩家光标，类似于物品栏内。
-      carousel_rendering_style:
-        name: "纸娃娃渲染样式"
-        description: "如何渲染在纸娃娃页面内的当前所选皮肤预设？\n"
-      preset_edit_screen_rendering_style:
-        name: "预览渲染样式"
-        description: "如何渲染在预设编辑页面的当前预览？\n"
-      widget_rendering_style:
-        name: "控件渲染样式"
-        description: "如何渲染在主菜单或暂停菜单的控件？\n"
-      rotation_speed:
-        name: "旋转倍速"
-        description: "如果皮肤旋转开启它将被运用多少的旋转倍速？"
-  button: "皮肤预设"
-  carousel:
-    title: "皮肤预设"
-
-    config_button.tooltip: "打开配置。"
-    view_type_button.large.tooltip: "宽松视图。"
-    view_type_button.compact.tooltip: "紧凑视图。"
-    shuffle_button.tooltip.enable: "启用切换。"
-    shuffle_button.tooltip.disable: "禁用禁用切换。"
-
-    default_tooltip: "§4你不能修改或复制默认预设。"
-
-    create: "新建"
-    new: "新建预设"
-    save_button: "选择预设"
-
-    # These are used for narrations.
-    left: "纸娃娃向左移动"
-    right: "纸娃娃向右移动"
-
-    confirmations:
-      delete_preset:
-        title: "删除预设"
-        message: "你确定要删除这个预设吗？\n它将会永久消失！（真的很久！）"
-
-    preset_widget:
-      edit: "编辑"
-      copy: "复制"
-      delete: "删除"
-      select: "选择"
-
-  edit:
-    customize:
-      title: "预设设置"
-      default: "宽型"
-      slim: "纤细"
-      model_cycle_prefix: "手臂模型"
-      preset_name: "预设名称"
-      cape_provider: "披风来源"
-    source:
-      username: "无效的用户名"
-      invalid_username: |-
-        §4§n无效的用户名§r
-        
-        用户名只能包含 a-Z、0-9；
-        用户名可以包含下划线；
-        用户名长度需为 3-16 字符；
-        用户名必须存在。
-      file: "文件"
-      invalid_file: |-
-        §4§n无效的文件§r
-        
-        文件必须存在并且为 §l.png§r 格式。
-      url: "URL"
-      invalid_url: |-
-        §4§n无效的URL§r
-        
-        URL无效。必须为有效的 §lhttp§r 或 §lhttps§r 协议URL。
-      uuid: "UUID"
-      invalid_uuid: |-
-        §4§n无效的UUID§r
-        
-        UUID需为以下格式：
-        §lxxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-      resource_location: "资源位置"
-      invalid_resource_location: |-
-        §4§n无效的资源位置§r
-      
-        资源位置需为已被游戏加载且有效的纹理文件。
-      unchanged: "保持现状"
-      cycle_prefix: "源"
-      title: "皮肤源"
-      skin_model: "皮肤模型"
-      load_skin: "加载皮肤"
\ No newline at end of file
diff --git a/src/main/resources/skinshuffle.accesswidener b/src/main/resources/skinshuffle.accesswidener
index 9e13f58..82fec61 100644
--- a/src/main/resources/skinshuffle.accesswidener
+++ b/src/main/resources/skinshuffle.accesswidener
@@ -1,23 +1,13 @@
 accessWidener   v1  named
 
-# Minecraft
-#accessible class net/minecraft/client/texture/ResourceTexture$TextureData
-#
-#accessible field net/minecraft/client/MinecraftClient server Lnet/minecraft/server/integrated/IntegratedServer;
-#
-#accessible method net/minecraft/client/QuickPlay startSingleplayer (Lnet/minecraft/client/MinecraftClient;Ljava/lang/String;)V
-#accessible method net/minecraft/client/QuickPlay startMultiplayer (Lnet/minecraft/client/MinecraftClient;Ljava/lang/String;)V
-#accessible method net/minecraft/client/QuickPlay startRealms (Lnet/minecraft/client/MinecraftClient;Lnet/minecraft/client/realms/RealmsClient;Ljava/lang/String;)V
-#
-#accessible class net/minecraft/client/toast/ToastManager$Entry
-#accessible field net/minecraft/client/toast/SystemToast title Lnet/minecraft/text/Text;
-#
-#accessible class net/minecraft/server/world/ThreadedAnvilChunkStorage$EntityTracker
-#accessible field net/minecraft/server/world/ThreadedAnvilChunkStorage entityTrackers Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
-#accessible field net/minecraft/server/world/ThreadedAnvilChunkStorage$EntityTracker entry Lnet/minecraft/server/network/EntityTrackerEntry;
-#accessible field net/minecraft/server/world/ThreadedAnvilChunkStorage$EntityTracker listeners Ljava/util/Set;
-#
-#accessible method net/minecraft/client/gui/widget/ClickableWidget drawScrollableText (Lnet/minecraft/client/gui/DrawContext;Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/Text;IIIII)V
-#accessible method net/minecraft/client/gui/widget/CyclingButtonWidget <init> (IIIILnet/minecraft/text/Text;Lnet/minecraft/text/Text;ILjava/lang/Object;Lnet/minecraft/client/gui/widget/CyclingButtonWidget$Values;Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraft/client/gui/widget/CyclingButtonWidget$UpdateCallback;Lnet/minecraft/client/option/SimpleOption$TooltipFactory;Z)V
-#
-#extendable method net/minecraft/entity/player/PlayerEntity updateCapeAngles ()V
\ No newline at end of file
+accessible class net/minecraft/client/texture/ResourceTexture$TextureData
+accessible method net/minecraft/client/QuickPlay startSingleplayer (Lnet/minecraft/client/MinecraftClient;Ljava/lang/String;)V
+accessible method net/minecraft/client/QuickPlay startMultiplayer (Lnet/minecraft/client/MinecraftClient;Ljava/lang/String;)V
+accessible method net/minecraft/client/QuickPlay startRealms (Lnet/minecraft/client/MinecraftClient;Lnet/minecraft/client/realms/RealmsClient;Ljava/lang/String;)V
+accessible class net/minecraft/client/toast/ToastManager$Entry
+accessible class net/minecraft/server/world/ThreadedAnvilChunkStorage$EntityTracker
+accessible field net/minecraft/server/world/ThreadedAnvilChunkStorage entityTrackers Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
+accessible field net/minecraft/server/world/ThreadedAnvilChunkStorage$EntityTracker entry Lnet/minecraft/server/network/EntityTrackerEntry;
+accessible field net/minecraft/server/world/ThreadedAnvilChunkStorage$EntityTracker listeners Ljava/util/Set;
+accessible method net/minecraft/client/gui/widget/ClickableWidget drawScrollableText (Lnet/minecraft/client/gui/DrawContext;Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/Text;IIIII)V
+accessible method net/minecraft/client/gui/widget/CyclingButtonWidget <init> (IIIILnet/minecraft/text/Text;Lnet/minecraft/text/Text;ILjava/lang/Object;Lnet/minecraft/client/gui/widget/CyclingButtonWidget$Values;Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraft/client/gui/widget/CyclingButtonWidget$UpdateCallback;Lnet/minecraft/client/option/SimpleOption$TooltipFactory;Z)V
\ No newline at end of file