diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index aba1b5f191bcf99153b112e70b0970498e1b64c7..caef5a7ec8f548ac6b40ea165c036111f6c3f0ce 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -1616,7 +1616,7 @@ window.rulesAssistantOptions = (function() {
 		}
 	}
 
-	class LeggingsList extends List {
+	class LeggingsList extends ListSelector {
 		constructor() {
 			const items = [
 				["none"],
@@ -1998,7 +1998,7 @@ window.rulesAssistantOptions = (function() {
 		}
 	}
 
-	class CurrativesList extends List {
+	class CurrativesList extends ListSelector {
 		constructor() {
 			const pairs = [
 				["none", 0],
@@ -2225,13 +2225,9 @@ window.rulesAssistantOptions = (function() {
 		}
 	}
 
-	class DietGrowthList extends List {
+	class DietGrowthList extends BooleanSwitch {
 		constructor() {
-			const pairs = [
-				["on", 1],
-				["off", 0]
-			];
-			super("Diet support for growth drugs", pairs, false, false, true);
+			super("Diet support for growth drugs", [0, 1]);
 			this.setValue(current_rule.set.dietGrowthSupport);
 			this.onchange = (value) => current_rule.set.dietGrowthSupport = value;
 		}
@@ -2599,7 +2595,7 @@ window.rulesAssistantOptions = (function() {
 		}
 	}
 
-	class EarwearList extends List {
+	class EarwearList extends ListSelector {
 		constructor() {
 			const pairs = [
 				["none"],
@@ -2648,7 +2644,7 @@ window.rulesAssistantOptions = (function() {
 		}
 	}
 
-	class HairLengthList extends List {
+	class HairLengthList extends ListSelector {
 		constructor() {
 			const pairs = [
 				["very short", 5],
@@ -2664,7 +2660,7 @@ window.rulesAssistantOptions = (function() {
 		}
 	}
 
-	class HaircutsList extends List {
+	class HaircutsList extends ListSelector {
 		constructor() {
 			const pairs = [
 				["maintain hair length", 1],
@@ -2828,7 +2824,7 @@ window.rulesAssistantOptions = (function() {
 		}
 	}
 
-	class MarkingsList extends List {
+	class MarkingsList extends ListSelector {
 		constructor() {
 			const pairs = [
 				["remove beauty marks"],
@@ -3009,7 +3005,7 @@ window.rulesAssistantOptions = (function() {
 		}
 	}
 
-	class AreolaPiercingList extends List {
+	class AreolaPiercingList extends ListSelector {
 		constructor() {
 			const pairs = [
 				["none", 0],
@@ -3069,7 +3065,7 @@ window.rulesAssistantOptions = (function() {
 		}
 	}
 
-	class CorsetPiercingList extends List {
+	class CorsetPiercingList extends ListSelector {
 		constructor() {
 			const pairs = [
 				["none", 0],
@@ -3528,7 +3524,7 @@ window.rulesAssistantOptions = (function() {
 		}
 	}
 
-	class CosmeticSurgeryList extends List {
+	class CosmeticSurgeryList extends ListSelector {
 		constructor() {
 			const items = [
 				["none", 0],