diff --git a/plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java b/plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java
index 83849ac..377465e 100644
--- a/plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java
+++ b/plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java
@@ -27,14 +27,14 @@ import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
-import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.display.ColorPreference;
 import org.openstreetmap.josm.tools.GBC;
 
-public class ColorSchemePreference implements SubPreferenceSetting {
+public class ColorSchemePreference extends DefaultTabPreferenceSetting {
     private static final String PREF_KEY_SCHEMES_PREFIX = "colorschemes.";
     private static final String PREF_KEY_SCHEMES_NAMES = PREF_KEY_SCHEMES_PREFIX + "names";
     public static final String PREF_KEY_COLOR_PREFIX = "color.";
@@ -47,6 +47,7 @@ public class ColorSchemePreference implements SubPreferenceSetting {
      * Default Constructor
      */
     public ColorSchemePreference() {
+        super(null, tr("Color Schemes"), tr("Allows the user to create different color schemes and to switch between them."));
     }
 
 
@@ -124,14 +125,7 @@ public class ColorSchemePreference implements SubPreferenceSetting {
         buttonPanel.add(addScheme, GBC.std().insets(0,5,5,0));
         buttonPanel.add(deleteScheme, GBC.std().insets(0,5,5,0));
 
-        JScrollPane scrollpane = new JScrollPane(panel);
-        scrollpane.setBorder(BorderFactory.createEmptyBorder( 0, 0, 0, 0 ));
-        gui.getDisplayPreference().getTabPane().addTab(tr("Color Schemes"), scrollpane);
-    }
-
-    @Override
-    public TabPreferenceSetting getTabPreferenceSetting(final PreferenceTabbedPane gui) {
-        return gui.getDisplayPreference();
+        gui.createPreferenceTab(this).add(panel, GBC.eol().fill(GBC.BOTH));
     }
 
     /**
diff --git a/plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java b/plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java
index 15a4693..606d0c4 100644
--- a/plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java
+++ b/plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java
@@ -33,9 +33,9 @@ import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
-import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
 import org.openstreetmap.josm.io.OsmWriter;
 import org.openstreetmap.josm.io.OsmWriterFactory;
@@ -156,10 +156,14 @@ public class OsmarenderPlugin extends Plugin {
         return new OsmarenderPreferenceSetting();
     }
 
-    private class OsmarenderPreferenceSetting implements SubPreferenceSetting {
+    private class OsmarenderPreferenceSetting extends DefaultTabPreferenceSetting {
 
         private JTextField firefox = new JTextField(10);
 
+        public OsmarenderPreferenceSetting() {
+            super(null, tr("Osmarender"), "");
+        }
+
         @Override
         public void addGui(PreferenceTabbedPane gui) {
             final JPanel panel = new JPanel(new GridBagLayout());
@@ -169,7 +173,8 @@ public class OsmarenderPlugin extends Plugin {
             panel.add(firefox, GBC.eol().insets(0,5,0,0).fill(GBC.HORIZONTAL));
             panel.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH));
             firefox.setText(Main.pref.get("osmarender.firefox"));
-            gui.getMapPreference().getTabPane().addTab(tr("Osmarender"), panel);
+
+            gui.createPreferenceTab(this).add(panel, GBC.eol().fill(GBC.BOTH));
         }
 
         @Override
@@ -183,11 +188,6 @@ public class OsmarenderPlugin extends Plugin {
             return false;
         }
 
-        @Override
-        public TabPreferenceSetting getTabPreferenceSetting(final PreferenceTabbedPane gui) {
-            return gui.getMapPreference();
-        }
-
     }
 
     private void writeGenerated(Bounds b) throws IOException {