diff --git a/scripts/Data_Settings.rb b/scripts/Data_Settings.rb
index 847ee29..304f82c 100644
--- a/scripts/Data_Settings.rb
+++ b/scripts/Data_Settings.rb
@@ -22,7 +22,6 @@ module Settings
         :language                                => 0,
         :fasttravel_ui                           => 0,
         :mainmenu_background                     => 0,
-        :ui_theme                                => 0,
 
         # Gameplay
         :movement                                => 0,
@@ -241,12 +240,6 @@ class Window_Settings
         :parameter => :mainmenu_background,
         :values => ["Original", "Badend", "Title Black"]
       },
-      {
-        :type => :enum,
-        :name => "UI theme",
-        :parameter => :ui_theme,
-        :values => ["Original", "World Machine", "World Machine Square"]
-      },
     ],
     "Gameplay" => [
       { :type => :sep, :name => "Vanilla" },
diff --git a/scripts/Window_Message.rb b/scripts/Window_Message.rb
index 03f52d5..f38d6a8 100644
--- a/scripts/Window_Message.rb
+++ b/scripts/Window_Message.rb
@@ -54,7 +54,6 @@ class Window_Message < Window_Selectable
 
     # Text blip sound
     @blipsound = nil
-    RPG::Mod.exec_hooks("hooks/Window_Message/init", binding)
   end
   #--------------------------------------------------------------------------
   # * Dispose
@@ -182,7 +181,7 @@ class Window_Message < Window_Selectable
     $game_system.windowskin_name = "normal"
     if $game_temp.message_face != nil
       if $game_temp.message_face.start_with?("en")
-        $game_system.windowskin_name = "en_normal"
+        $game_system.windowskin_name = "en_square"
         self.y = 16;
       else
         $game_system.windowskin_name = "normal"
diff --git a/tests.sh b/tests.sh
index 12125da..b41de41 100644
--- a/tests.sh
+++ b/tests.sh
@@ -7,11 +7,11 @@ check_file() {
 
   case "$f" in
     *.c|*.cc|*.cpp|*.cxx)
-      cppcheck --check-level=exhaustive --disable=missingInclude --enable=all --force -q -I . "$f" \
-        || echo "cppcheck is not installed or reported issues for: $f"
+      #cppcheck --check-level=exhaustive --disable=missingInclude --enable=all --force -q -I . "$f" \
+      #  || echo "cppcheck is not installed or reported issues for: $f"
 
-      gcc -fanalyzer -Wall -Wextra -Wpedantic -std=c11 -c "$f" -o /dev/null 2>/dev/null \
-        || echo "gcc is not installed or analyzer reported issues for: $f"
+      #gcc -fanalyzer -Wall -Wextra -Wpedantic -std=c11 -c "$f" -o /dev/null 2>/dev/null \
+      #  || echo "gcc is not installed or analyzer reported issues for: $f"
 
       cbmc "$f" \
         || echo "cbmc is not installed or reported issues for: $f"