diff --git a/src/main/java/org/saturnclient/feature/Feature.java b/src/main/java/org/saturnclient/feature/Feature.java
index a4da5bb..ed16e48 100644
--- a/src/main/java/org/saturnclient/feature/Feature.java
+++ b/src/main/java/org/saturnclient/feature/Feature.java
@@ -2,7 +2,7 @@ package org.saturnclient.feature;
 
 import org.saturnclient.common.ref.asset.IdentifierRef;
 import org.saturnclient.config.ConfigManager;
-import org.saturnclient.config.property.Property.NamedProperty;
+import org.saturnclient.config.property.NamedProperty;
 import org.saturnclient.ui.RenderScope;
 import org.saturnclient.ui.resources.Textures;
 
@@ -10,10 +10,10 @@ public abstract class Feature {
     private final FeatureDetails details;
     private final ConfigManager configManager;
 
-    public Feature(FeatureDetails details, NamedProperty<?>... props) {
+    public Feature(FeatureDetails details, NamedProperty... props) {
         this.details = details;
         configManager = new ConfigManager(details.name);
-        for (NamedProperty<?> prop : props) {
+        for (NamedProperty prop : props) {
             configManager.property(prop.name, prop.prop);
         }
     }
diff --git a/src/main/java/org/saturnclient/feature/FeatureLayout.java b/src/main/java/org/saturnclient/feature/FeatureLayout.java
index a82ac35..b5b58f1 100644
--- a/src/main/java/org/saturnclient/feature/FeatureLayout.java
+++ b/src/main/java/org/saturnclient/feature/FeatureLayout.java
@@ -3,22 +3,26 @@ package org.saturnclient.feature;
 import java.util.Map;
 
 import org.saturnclient.config.property.Property;
-import org.saturnclient.config.property.Property.NamedProperty;
+import org.saturnclient.config.property.SelectProperty;
+import org.saturnclient.config.property.ColorProperty;
+import org.saturnclient.config.property.FloatProperty;
+import org.saturnclient.config.property.IntProperty;
+import org.saturnclient.config.property.NamedProperty;
 
 public class FeatureLayout {
-    public Property<Integer> x = Property.integer(0);
-    public Property<Integer> y = Property.integer(0);
-    public Property<Float> scale = Property.floatProp(1.0f);
-    public Property<Integer> bgColor = Property.color(0x00000000);
-    public Property<Integer> fgColor = Property.color(0xFFffffff);
-    public Property<Integer> radius = Property.integer(0);
-    public Property<Integer> font = Property.font(0);
+    public IntProperty x = Property.integer(0);
+    public IntProperty y = Property.integer(0);
+    public FloatProperty scale = Property.floatProp(1.0f);
+    public ColorProperty bgColor = Property.color(0x00000000);
+    public ColorProperty fgColor = Property.color(0xFFffffff);
+    public IntProperty radius = Property.integer(0);
+    public SelectProperty font = Property.font(0);
     public boolean renderBackground = true;
 
     public int width = 0;
     public int height = 0;
 
-    public NamedProperty<Map<String, Property<?>>> prop() {
+    public NamedProperty prop() {
         return Property.namespace(Map.of(
                 "X", x,
                 "Y", y,