diff --git a/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/os/windows/NitroWindows.java b/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/os/windows/NitroWindows.java
index c5f4655..ec55105 100644
--- a/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/os/windows/NitroWindows.java
+++ b/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/os/windows/NitroWindows.java
@@ -25,7 +25,7 @@ public class NitroWindows implements NitroOsFunctions {
     @Override
     public boolean isRootCertificateTrusted(File certificate) {
         try {
-            final String output = RuntimeUtil.getCommandOutput(new String[] {"cmd", "/c", " certutil.exe -f -verify " + certificate.getAbsolutePath()});
+            final String output = RuntimeUtil.getCommandOutput(new String[] {"cmd", "/c", " certutil.exe -f -verify \"" + certificate.getAbsolutePath() + "\""});
 
             return !output.contains("CERT_TRUST_IS_UNTRUSTED_ROOT") &&
                     output.contains("dwInfoStatus=10c dwErrorStatus=0");
@@ -41,7 +41,7 @@ public class NitroWindows implements NitroOsFunctions {
         final String certificatePath = certificate.getAbsolutePath();
 
         // Prompt UAC elevation.
-        WinDef.HINSTANCE result = NitroWindowsShell32.INSTANCE.ShellExecuteA(null, "runas", "cmd.exe", "/S /C \"certutil -addstore root " + certificatePath + "\"", null, 1);
+        WinDef.HINSTANCE result = NitroWindowsShell32.INSTANCE.ShellExecuteA(null, "runas", "cmd.exe", "/S /C 'certutil -addstore root \"" + certificatePath + "\"'", null, 1);
 
         // Wait for exit.
         Kernel32.INSTANCE.WaitForSingleObject(result, WinBase.INFINITE);
diff --git a/G-Earth/src/main/java/gearth/protocol/memory/habboclient/linux/LinuxHabboClient.java b/G-Earth/src/main/java/gearth/protocol/memory/habboclient/linux/LinuxHabboClient.java
index cab3d91..827ecda 100644
--- a/G-Earth/src/main/java/gearth/protocol/memory/habboclient/linux/LinuxHabboClient.java
+++ b/G-Earth/src/main/java/gearth/protocol/memory/habboclient/linux/LinuxHabboClient.java
@@ -10,7 +10,7 @@ import java.util.*;
 public class LinuxHabboClient extends HabboClient {
 
 
-    private static final String[] potentialProcessNames = {"--ppapi-flash-args", "plugin-container", "Habbo.exe"};
+    private static final String[] potentialProcessNames = {"--ppapi-flash-args", "plugin-container", "Habbo"};
 
     List<PotentialHabboProcess> potentialProcesses = new ArrayList<>();
 
diff --git a/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java b/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java
index aeefe0d..ed9c87f 100644
--- a/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java
+++ b/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java
@@ -89,10 +89,13 @@ public class TitleBarController {
             stage.getScene().setFill(Color.TRANSPARENT);
             stage.getScene().getRoot().getStyleClass().add("root-node");
 
-            controller.themeBtn.setVisible(config.displayThemePicker());
             if (!config.displayMinimizeButton()) {
                 ((GridPane) controller.minimizeBtn.getParent()).getChildren().remove(controller.minimizeBtn);
             }
+
+            if (!config.displayThemePicker()) {
+                ((GridPane) controller.themeBtn.getParent()).getChildren().remove(controller.themeBtn);
+            }
         });
         return controller;
     }
@@ -107,7 +110,6 @@ public class TitleBarController {
         Platform.runLater(() -> titleLabel.setText(title));
     }
 
-
     public void handleCloseAction(MouseEvent event) {
         config.onCloseClicked();
     }