diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
index 57b0c0e055b1961285cb34f0fee9804fc3db9a63..b8f10bfb3841f3fe5bd5f471efaecb354fe15b46 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@@ -301,12 +301,12 @@ public class SnarkManager implements Snark.CompleteListener {
         boolean universalTheming = _context.getBooleanProperty(RC_PROP_UNIVERSAL_THEMING);
         if (universalTheming) {
             // Fetch routerconsole theme (or use our default if it doesn't exist)
-            theme = _context.getProperty(RC_PROP_THEME_NAME, DEFAULT_THEME);
+            theme = _context.getProperty(RC_PROP_THEME, DEFAULT_THEME);
             // Ensure that theme exists
             String[] themes = getThemes();
             boolean themeExists = false;
             for (int i = 0; i < themes.length; i++) {
-                if (themes[i].equals(_theme))
+                if (themes[i].equals(theme))
                     themeExists = true;
             }
             if (!themeExists) {
diff --git a/apps/susidns/src/java/src/i2p/susi/dns/BaseBean.java b/apps/susidns/src/java/src/i2p/susi/dns/BaseBean.java
index dcce8331810233898780d669b3e62a7316a6e294..36e0a2b38d06f9aaadca6b12e7a5ae11b6347158 100644
--- a/apps/susidns/src/java/src/i2p/susi/dns/BaseBean.java
+++ b/apps/susidns/src/java/src/i2p/susi/dns/BaseBean.java
@@ -1,5 +1,7 @@
 package i2p.susi.dns;
 
+import java.io.File;
+import java.io.FileFilter;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Properties;
diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
index b23d049780ef19df0bbc86a8bae1ee9d30b76e70..cfb12c0b6502ff51e65436beaba60feaae0489fb 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
@@ -1198,7 +1198,7 @@ public class WebMail extends HttpServlet
 		boolean universalTheming = ctx.getBooleanProperty(RC_PROP_UNIVERSAL_THEMING);
 		if (universalTheming) {
 			// Fetch routerconsole theme (or use our default if it doesn't exist)
-			theme = ctx.getProperty(RC_PROP_THEME_NAME, DEFAULT_THEME);
+			theme = ctx.getProperty(RC_PROP_THEME, DEFAULT_THEME);
 			// Ensure that theme exists
 			String[] themes = getThemes();
 			boolean themeExists = false;