diff --git a/uppsrc/ide/Methods.cpp b/uppsrc/ide/Methods.cpp
index 6bac8c463..8fd9c4acd 100644
--- a/uppsrc/ide/Methods.cpp
+++ b/uppsrc/ide/Methods.cpp
@@ -1,16 +1,5 @@
 #include "Methods.h"
 
-void  TextSwitch::SetData(const Value& data)
-{
-	String s = data;
-	Switch::SetData(atoi((String)data));
-}
-
-Value TextSwitch::GetData() const
-{
-	return AsString(Switch::GetData());
-}
-
 void DirTable::SetData(const Value& data)
 {
 	Vector<String> l = Split((String)data, ';');
@@ -329,8 +318,6 @@ DefaultBuilderSetup::DefaultBuilderSetup()
 {
 	CtrlLayout(*this);
 	
-	allow_pch.SetLabel("Allow precompiled headers");
-	
 	paths.Add(path.SizePos(), "PATH - executable directories");
 	paths.Add(include.SizePos(), "INCLUDE directories");
 	paths.Add(lib.SizePos(), "LIB directories");
diff --git a/uppsrc/ide/Methods.h b/uppsrc/ide/Methods.h
index cc2a28359..d3f18221d 100644
--- a/uppsrc/ide/Methods.h
+++ b/uppsrc/ide/Methods.h
@@ -3,12 +3,6 @@
 
 #include "ide.h"
 
-class TextSwitch : public Switch {
-public:
-	virtual void   SetData(const Value& data);
-	virtual Value  GetData() const;
-};
-
 class DirTable : public ArrayCtrl {
 public:
 	virtual void   SetData(const Value& data);
@@ -106,11 +100,6 @@ public:
 
 class DefaultBuilderSetup : public WithBuildMethodsDefaultBuilderSetupLayout<BuilderSetupInterface> {
 public:
-	TextOption debug_blitz;
-	TextSwitch debug_linkmode;
-	TextOption release_blitz;
-	TextSwitch release_linkmode;
-	TextOption allow_pch;
 	DirTable   path;
 	DirTable   include;
 	DirTable   lib;
diff --git a/uppsrc/ide/MethodsCtrls.cpp b/uppsrc/ide/MethodsCtrls.cpp
index a424b93aa..e61a67f5a 100644
--- a/uppsrc/ide/MethodsCtrls.cpp
+++ b/uppsrc/ide/MethodsCtrls.cpp
@@ -10,3 +10,14 @@ Value TextOption::GetData() const
 {
 	return Get() ? "1" : "0";
 }
+
+void  TextSwitch::SetData(const Value& data)
+{
+	String s = data;
+	Switch::SetData(atoi((String)data));
+}
+
+Value TextSwitch::GetData() const
+{
+	return AsString(Switch::GetData());
+}
diff --git a/uppsrc/ide/MethodsCtrls.h b/uppsrc/ide/MethodsCtrls.h
index ece61ec32..6cc9e8781 100644
--- a/uppsrc/ide/MethodsCtrls.h
+++ b/uppsrc/ide/MethodsCtrls.h
@@ -11,6 +11,12 @@ public:
 	virtual Value  GetData() const;
 };
 
+class TextSwitch : public Switch {
+public:
+	virtual void   SetData(const Value& data);
+	virtual Value  GetData() const;
+};
+
 END_UPP_NAMESPACE
 
 #endif
diff --git a/uppsrc/ide/ide.lay b/uppsrc/ide/ide.lay
index 916a39f78..60a725e33 100644
--- a/uppsrc/ide/ide.lay
+++ b/uppsrc/ide/ide.lay
@@ -244,17 +244,17 @@ LAYOUT(BuildMethodsDefaultBuilderSetupLayout, 648, 500)
 	ITEM(LabelBox, dv___12, SetLabel(t_("Tools")).HSizePosZ(0, 0).TopPosZ(0, 44))
 	ITEM(Label, dv___13, SetLabel(t_("Default debug info level:")).LeftPosZ(4, 132).TopPosZ(152, 19))
 	ITEM(DropList, debug_info, LeftPosZ(140, 116).TopPosZ(152, 19))
-	UNTYPED(debug_blitz, SwitchImage(false).SetLabel(t_("Use BLIT&Z")).HSizePosZ(264, 276).TopPosZ(152, 15))
-	UNTYPED(debug_linkmode, SetLabel(t_("All static\nShared libs\nAll shared")).HSizePosZ(376, 12).TopPosZ(152, 15))
+	ITEM(TextOption, debug_blitz, SetLabel(t_("Use BLIT&Z")).HSizePosZ(264, 276).TopPosZ(152, 15))
+	ITEM(TextOption, debug_linkmode, SetLabel(t_("All static\nShared libs\nAll shared")).HSizePosZ(376, 12).TopPosZ(152, 15))
 	ITEM(Label, dv___17, SetLabel(t_("&Debug options:")).LeftPosZ(0, 112).TopPosZ(184, 19))
 	ITEM(EditString, debug_options, HSizePosZ(116, 0).TopPosZ(184, 19))
 	ITEM(Label, dv___19, SetLabel(t_("Debug fixed flags:")).LeftPosZ(0, 112).TopPosZ(204, 19))
 	ITEM(EditString, debug_flags, HSizePosZ(116, 0).TopPosZ(204, 19))
 	ITEM(Label, dv___21, SetLabel(t_("Debug link options:")).LeftPosZ(0, 112).TopPosZ(224, 19))
 	ITEM(EditString, debug_link, HSizePosZ(116, 0).TopPosZ(224, 19))
-	UNTYPED(release_linkmode, SetLabel(t_("All static\nShared libs\nAll shared")).HSizePosZ(376, 20).TopPosZ(268, 16))
+	ITEM(TextSwitch, release_linkmode, SetLabel(t_("All static\nShared libs\nAll shared")).HSizePosZ(376, 20).TopPosZ(268, 16))
 	ITEM(LabelBox, dv___24, SetLabel(t_("Release mode defaults")).HSizePosZ(0, 0).TopPosZ(252, 40))
-	UNTYPED(release_blitz, SwitchImage(false).SetLabel(t_("&Use BLITZ")).LeftPosZ(8, 256).TopPosZ(268, 15))
+	ITEM(TextOption, release_blitz, SetLabel(t_("&Use BLITZ")).LeftPosZ(8, 256).TopPosZ(268, 15))
 	ITEM(Label, dv___26, SetLabel(t_("Optimize for speed:")).LeftPosZ(0, 112).TopPosZ(296, 19))
 	ITEM(EditString, speed_options, HSizePosZ(116, 0).TopPosZ(296, 19))
 	ITEM(Label, dv___28, SetLabel(t_("Optimize for size:")).LeftPosZ(0, 112).TopPosZ(316, 19))
@@ -264,7 +264,7 @@ LAYOUT(BuildMethodsDefaultBuilderSetupLayout, 648, 500)
 	ITEM(Label, dv___32, SetLabel(t_("Release link options:")).LeftPosZ(0, 112).TopPosZ(356, 19))
 	ITEM(EditString, release_link, HSizePosZ(116, 0).TopPosZ(356, 19))
 	ITEM(TabCtrl, paths, HSizePosZ(0, 0).VSizePosZ(400, 0))
-	UNTYPED(allow_pch, LeftPosZ(0, 212).TopPosZ(380, 16))
+	ITEM(TextOption, allow_pch, SetLabel(t_("Allow precompiled headers")).LeftPosZ(0, 212).TopPosZ(380, 16))
 	ITEM(LabelBox, dv___36, SetLabel(t_("Debug mode defaults")).HSizePosZ(0, 0).TopPosZ(136, 44))
 END_LAYOUT
 
diff --git a/uppsrc/ide/ide.usc b/uppsrc/ide/ide.usc
index 655333c05..a6cbab7d0 100644
--- a/uppsrc/ide/ide.usc
+++ b/uppsrc/ide/ide.usc
@@ -1,4 +1,8 @@
 // MethodsCtrl
 subctrl TextOption {
-	>Option;
-}
+	> Option;
+};
+
+subctrl TextSwitch {
+	> Switch;
+};