diff --git a/src/dorkbox/jna/linux/GtkTheme.java b/src/dorkbox/jna/linux/GtkTheme.java
index 804cfe4..e6222c6 100644
--- a/src/dorkbox/jna/linux/GtkTheme.java
+++ b/src/dorkbox/jna/linux/GtkTheme.java
@@ -38,7 +38,6 @@ import dorkbox.jna.linux.structs.GtkStyle;
 import dorkbox.jna.linux.structs.PangoRectangle;
 import dorkbox.os.OS;
 import dorkbox.os.OSUtil;
-import dorkbox.propertyLoader.Property;
 import dorkbox.util.FileUtil;
 import dorkbox.util.MathUtil;
 
@@ -48,13 +47,11 @@ import dorkbox.util.MathUtil;
 @SuppressWarnings({"unused", "WeakerAccess"})
 public
 class GtkTheme {
-    @Property
     /** Fallback for an unknown tray image size. */
-    public static int TRAY_IMAGE_SIZE_FALLBACK = 24;
+    public static volatile int TRAY_IMAGE_SIZE_FALLBACK = OS.getInt(GtkTheme.class.getCanonicalName() + ".TRAY_IMAGE_SIZE_FALLBACK", 24);
 
-    @Property
     /** Fallback for an unknown tray menu image size. */
-    public static int TRAY_MENU_IMAGE_SIZE_FALLBACK = 16;
+    public static volatile int TRAY_MENU_IMAGE_SIZE_FALLBACK = OS.getInt(GtkTheme.class.getCanonicalName() + ".TRAY_MENU_IMAGE_SIZE_FALLBACK", 16);
 
     public static
     Rectangle getPixelTextHeight(String text) {
diff --git a/src/dorkbox/util/FontUtil.java b/src/dorkbox/util/FontUtil.java
index 82aa3ae..6670259 100644
--- a/src/dorkbox/util/FontUtil.java
+++ b/src/dorkbox/util/FontUtil.java
@@ -30,7 +30,7 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Enumeration;
 
-import dorkbox.propertyLoader.Property;
+import dorkbox.os.OS;
 
 /**
  * Java Font utilities
@@ -39,8 +39,7 @@ import dorkbox.propertyLoader.Property;
 public
 class FontUtil {
     /** Default location where all the fonts are stored */
-    @Property
-    public static String FONTS_LOCATION = "resources/fonts";
+    public static volatile String FONTS_LOCATION = OS.getProperty(FontUtil.class.getCanonicalName() + ".FONTS_LOCATION", "resources/fonts");
 
 
     /** All of the fonts in the {@link #FONTS_LOCATION} will be loaded by the Font manager */
diff --git a/src/dorkbox/util/collections/ConcurrentIterator.java b/src/dorkbox/util/collections/ConcurrentIterator.java
index 24fbd19..b3760a4 100644
--- a/src/dorkbox/util/collections/ConcurrentIterator.java
+++ b/src/dorkbox/util/collections/ConcurrentIterator.java
@@ -19,7 +19,7 @@ package dorkbox.util.collections;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
-import dorkbox.propertyLoader.Property;
+import dorkbox.os.OS;
 
 /**
  * @author dorkbox, llc
@@ -30,8 +30,7 @@ class ConcurrentIterator<T> {
     /**
      * Specifies the load-factor for the IdentityMap used
      */
-    @Property
-    public static final float LOAD_FACTOR = 0.8F;
+    public static volatile float LOAD_FACTOR = OS.getFloat(ConcurrentIterator.class.getCanonicalName() + ".LOAD_FACTOR", 0.8F);
 
     private static final AtomicInteger ID_COUNTER = new AtomicInteger();
     private final int ID = ID_COUNTER.getAndIncrement();