diff --git a/cmake/vala b/cmake/vala
index 2e518fc..0e6fcd5 160000
--- a/cmake/vala
+++ b/cmake/vala
@@ -1 +1 @@
-Subproject commit 2e518fc9a18a659203050269a4783949e34bd3a6
+Subproject commit 0e6fcd579147de15f9a0fcdd94509ed60e17e600
diff --git a/src/dbusmenu b/src/dbusmenu
index 8c08bf2..06c1e08 160000
--- a/src/dbusmenu
+++ b/src/dbusmenu
@@ -1 +1 @@
-Subproject commit 8c08bf21a4ced4d4a9404d61b2153f324c66f879
+Subproject commit 06c1e08f5cb224a2617132e8a749dd139fc39eb6
diff --git a/src/snconfig.vala b/src/snconfig.vala
index 5b10d59..79168dd 100644
--- a/src/snconfig.vala
+++ b/src/snconfig.vala
@@ -6,13 +6,13 @@ namespace StatusNotifier
     [GtkTemplate (ui = "/org/vala-panel/sntray/snconfig.ui"), CCode (cname = "StatusNotifierConfig")]
     public class ConfigDialog : Dialog
     {
-        private static const int COLUMN_ID = 0;
-        private static const int COLUMN_NAME = 1;
-        private static const int COLUMN_OVERRIDE_INDEX = 2;
-        private static const int COLUMN_INDEX = 3;
-        private static const int COLUMN_OVERRIDE_VISIBLE = 4;
-        private static const int COLUMN_VISIBLE = 5;
-        private static const int COLUMN_ICON = 6;
+        private const int COLUMN_ID = 0;
+        private const int COLUMN_NAME = 1;
+        private const int COLUMN_OVERRIDE_INDEX = 2;
+        private const int COLUMN_INDEX = 3;
+        private const int COLUMN_OVERRIDE_VISIBLE = 4;
+        private const int COLUMN_VISIBLE = 5;
+        private const int COLUMN_ICON = 6;
 
         [GtkChild (name = "check-application")]
         CheckButton check_application;
diff --git a/src/snitembox.vala b/src/snitembox.vala
index 502bf78..289392a 100644
--- a/src/snitembox.vala
+++ b/src/snitembox.vala
@@ -3,17 +3,17 @@ using GLib;
 
 namespace StatusNotifier
 {
-    public static const string SHOW_APPS = "show-application-status";
-    public static const string SHOW_COMM = "show-communications";
-    public static const string SHOW_SYS = "show-system";
-    public static const string SHOW_HARD = "show-hardware";
-    public static const string SHOW_OTHER = "show-other";
-    public static const string SHOW_PASSIVE = "show-passive";
-    public static const string INDICATOR_SIZE = "indicator-size";
-    public static const string USE_SYMBOLIC = "symbolic-icons";
-    public static const string USE_LABELS = "show-ayatana-labels";
-    public static const string INDEX_OVERRIDE = "index-override";
-    public static const string FILTER_OVERRIDE = "filter-override";
+    public const string SHOW_APPS = "show-application-status";
+    public const string SHOW_COMM = "show-communications";
+    public const string SHOW_SYS = "show-system";
+    public const string SHOW_HARD = "show-hardware";
+    public const string SHOW_OTHER = "show-other";
+    public const string SHOW_PASSIVE = "show-passive";
+    public const string INDICATOR_SIZE = "indicator-size";
+    public const string USE_SYMBOLIC = "symbolic-icons";
+    public const string USE_LABELS = "show-ayatana-labels";
+    public const string INDEX_OVERRIDE = "index-override";
+    public const string FILTER_OVERRIDE = "filter-override";
     public class ItemBox : FlowBox
     {
         static Host host;