diff --git a/HMCL/build.gradle b/HMCL/build.gradle
index 1fa04fea9..167cc189c 100755
--- a/HMCL/build.gradle
+++ b/HMCL/build.gradle
@@ -33,7 +33,7 @@ def buildnumber = System.getenv("TRAVIS_BUILD_NUMBER")
 if (buildnumber == null)
     buildnumber = System.getenv("BUILD_NUMBER")
 if (buildnumber == null)
-    buildnumber = "3"
+    buildnumber = "4"
     
 def versionroot = System.getenv("VERSION_ROOT")
 if (versionroot == null)
diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.form b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.form
index 02e0dc17f..fa1a07eaf 100755
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.form
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.form
@@ -347,7 +347,7 @@
     <Component class="javax.swing.JCheckBox" name="chkEnableBlur">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/jackhuang/hellominecraft/lang/I18N.properties" key="launcher.enable_blur" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
+          <ResourceString bundle="org/jackhuang/hellominecraft/lang/I18N.properties" key="launcher.enable_blur" replaceFormat="C.i18n(&quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.java
index 860ac0c84..b2f6fa751 100755
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.java
@@ -237,8 +237,7 @@ public class LauncherSettingsPanel extends RepaintPage {
             }
         });
 
-        java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("org/jackhuang/hellominecraft/lang/I18N"); // NOI18N
-        chkEnableBlur.setText(bundle.getString("launcher.enable_blur")); // NOI18N
+        chkEnableBlur.setText(C.i18n("launcher.enable_blur")); // NOI18N
         chkEnableBlur.addItemListener(new java.awt.event.ItemListener() {
             public void itemStateChanged(java.awt.event.ItemEvent evt) {
                 chkEnableBlurItemStateChanged(evt);
@@ -291,8 +290,8 @@ public class LauncherSettingsPanel extends RepaintPage {
                                 .addComponent(btnCheckUpdate)
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                                 .addComponent(btnMCBBS))
-                            .addComponent(lblAbout, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                            .addComponent(lblModpack, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(lblAbout)
+                            .addComponent(lblModpack)
                             .addComponent(lblRestart)
                             .addGroup(layout.createSequentialGroup()
                                 .addComponent(chkEnableShadow)
@@ -346,9 +345,9 @@ public class LauncherSettingsPanel extends RepaintPage {
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(lblRestart)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(lblModpack, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addComponent(lblModpack)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(lblAbout, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addComponent(lblAbout)
                 .addContainerGap())
         );
     }// </editor-fold>//GEN-END:initComponents
diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/lang/Localization.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/lang/Localization.java
index 7ace45029..2f398343d 100644
--- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/lang/Localization.java
+++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/lang/Localization.java
@@ -45,7 +45,7 @@ public final class Localization {
         if (is == null)
             is = getStream("_" + locale.getLanguage());
         if (is == null)
-            is = getStream("_en");
+            is = getStream("");
         if (is == null)
             throw new InternalError("Language file missing");
 
diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/lang/SupportedLocales.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/lang/SupportedLocales.java
index bf1021f97..edc0dd735 100644
--- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/lang/SupportedLocales.java
+++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/lang/SupportedLocales.java
@@ -24,7 +24,7 @@ import java.util.Locale;
  * @author huangyuhui
  */
 public enum SupportedLocales {
-    def(Locale.getDefault(), "lang.default"), en(Locale.ENGLISH, null), zh_TW(Locale.TRADITIONAL_CHINESE, null), zh_CN(Locale.SIMPLIFIED_CHINESE, null), vi(new Locale("vi"), null);
+    def(Locale.getDefault(), "lang.default"), en(Locale.ENGLISH, null), zh(Locale.TRADITIONAL_CHINESE, null), zh_CN(Locale.SIMPLIFIED_CHINESE, null), vi(new Locale("vi"), null);
 
     public Locale self;
     private String showString, customized;
diff --git a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_en.lang b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.lang
similarity index 100%
rename from HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_en.lang
rename to HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.lang
diff --git a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_en.properties b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.properties
similarity index 100%
rename from HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_en.properties
rename to HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.properties
diff --git a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.lang b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh.lang
similarity index 100%
rename from HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.lang
rename to HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh.lang
diff --git a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.properties b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh.properties
similarity index 100%
rename from HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.properties
rename to HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh.properties