diff --git a/src/btop_config.cpp b/src/btop_config.cpp
index 1df5eef80..1bdbbb36b 100644
--- a/src/btop_config.cpp
+++ b/src/btop_config.cpp
@@ -21,6 +21,7 @@ tab-size = 4
 #include <exception>
 #include <fstream>
 #include <ranges>
+#include <stdexcept>
 #include <string_view>
 
 #include <fmt/core.h>
@@ -44,7 +45,7 @@ namespace Config {
 	atomic<bool> locked (false);
 	atomic<bool> writelock (false);
 	bool write_new;
-	robin_hood::unordered_flat_set<std::string_view> cached{};
+	unordered_flat_map<uint32_t, ConfigType> cached{};
 	ConfigSet current = ConfigSet::with_defaults();
 	ConfigSet cache{};
 
@@ -150,34 +151,21 @@ namespace Config {
 
 	string validError;
 
-	bool intValid(const std::string_view name, const string& value) {
-		int i_value;
+	bool to_int(const string& value, int& result) {
 		try {
-			i_value = stoi(value);
-		}
-		catch (const std::invalid_argument&) {
+			result = stoi(value);
+		} catch (const std::invalid_argument&) {
 			validError = "Invalid numerical value!";
 			return false;
-		}
-		catch (const std::out_of_range&) {
+		} catch (const std::out_of_range&) {
 			validError = "Value out of range!";
-			return false;
-		}
-		catch (const std::exception& e) {
+			return  false;
+		} catch (const std::exception& e) {
 			validError = string{e.what()};
 			return false;
 		}
 
-		if (name == "update_ms" and i_value < 100)
-			validError = "Config value update_ms set too low (<100).";
-
-		else if (name == "update_ms" and i_value > 86400000)
-			validError = "Config value update_ms set too high (>86400000).";
-
-		else
-			return true;
-
-		return false;
+		return true;
 	}
 
 	bool stringValid(const std::string_view name, const string& value) {
@@ -242,18 +230,16 @@ namespace Config {
 		dynamic_set<T>(dest, offset, dynamic_get<T>(src, offset));
 	}
 
-	string getAsString(const std::string_view name) {
-		auto& entry = parse_table.at(name);
-		switch(entry.type) {
-			case ConfigType::BOOL:
-				return dynamic_get<bool>(current, entry.offset) ? "True" : "False";
-			case ConfigType::INT:
-				return to_string(dynamic_get<int>(current, entry.offset));
-			case ConfigType::STRING:
-				return dynamic_get<string>(current, entry.offset);
-			default:
-				throw std::logic_error("Not implemented");
+	string getAsString(const size_t offset) {
+		switch(offset) {
+#define X(T, name, v, desc) \
+			case CONFIG_OFFSET(name): \
+				return details::to_string<T>(current, offset);
+			OPTIONS_LIST
+#undef X
 		}
+
+		return "";
 	}
 
 	void unlock() {
@@ -270,17 +256,15 @@ namespace Config {
 		}
 
 		for(auto& item: cached) {
-			auto& data = parse_table.at(item);
-
-			switch(data.type) {
+			switch(item.second) {
 				case ConfigType::STRING:
-					copy_field<string>(current, cache, data.offset);
+					copy_field<string>(current, cache, item.first);
 					break;
 				case ConfigType::INT:
-					copy_field<int>(current, cache, data.offset);
+					copy_field<int>(current, cache, item.first);
 					break;
 				case ConfigType::BOOL:
-					copy_field<bool>(current, cache, data.offset);
+					copy_field<bool>(current, cache, item.first);
 					break;
 			}
 		}
@@ -350,23 +334,23 @@ namespace Config {
 				}
 				cread >> std::ws;
 
+				int intValue;
 				switch(found->second.type) {
 					case ConfigType::BOOL:
 						cread >> value;
-						if (not isbool(value))
-							load_warnings.push_back("Got an invalid bool value for config name: " + name);
-						else
+						try {
 							dynamic_set(set, found->second.offset, stobool(value));
+						} catch(std::invalid_argument&) {
+							load_warnings.push_back("Got an invalid bool value for config name: " + name);
+						}
 						break;
 					case ConfigType::INT:
 						cread >> value;
-						if (not isint(value))
-							load_warnings.push_back("Got an invalid integer value for config name: " + name);
-						else if (not intValid(name, value)) {
+						if(to_int(value, intValue) and validate(found->second.offset, intValue)) {
+							dynamic_set(set, found->second.offset, intValue);
+						} else {
 							load_warnings.push_back(validError);
 						}
-						else
-							dynamic_set(set, found->second.offset, stoi(value));
 						break;
 					case ConfigType::STRING:
 						if (cread.peek() == '"') {
@@ -375,10 +359,11 @@ namespace Config {
 						}
 						else cread >> value;
 
-						if (not stringValid(name, value))
-							load_warnings.push_back(validError);
-						else
+						if (validate(found->second.offset, value)) {
 							dynamic_set(set, found->second.offset, value);
+						} else {
+							load_warnings.push_back(validError);
+						}
 						break;
 				}
 
@@ -391,34 +376,37 @@ namespace Config {
 		}
 	}
 
+	template<typename T>
+	inline void write_field(std::ofstream& stream, const std::string_view name, const T& value, const std::string_view description) {
+		stream << "\n\n";
+		if(not description.empty()) {
+			stream << description << '\n';
+		}
+
+		stream << name << " = ";
+
+		if constexpr(std::is_same_v<T, bool>) {
+			stream << (value ? "True" : "False");
+		}
+
+		if constexpr(std::is_same_v<T, int>) {
+			stream << value;
+		}
+
+		if constexpr(std::is_same_v<T, string>) {
+			stream << '"' << value << '"';
+		}
+	}
+
 	void write() {
 		if (conf_file.empty() or not write_new) return;
 		Logger::debug("Writing new config file");
 		if (geteuid() != Global::real_uid and seteuid(Global::real_uid) != 0) return;
 		std::ofstream cwrite(conf_file, std::ios::trunc);
-		auto write_field = [&](const std::string_view name, const std::string_view description) {
-			cwrite << "\n\n";
-			if(not description.empty()) {
-				cwrite << description << "\n";
-			}
-			cwrite << name << " = ";
-			auto& data = parse_table.at(name);
-			switch(data.type) {
-				case ConfigType::BOOL:
-					cwrite << (dynamic_get<bool>(current, data.offset) ? "True" : "False");
-					break;
-				case ConfigType::INT:
-					cwrite << dynamic_get<int>(current, data.offset);
-					break;
-				case ConfigType::STRING:
-					cwrite << '"' << dynamic_get<string>(current, data.offset) << '"';
-					break;
-			}
-		};
 
 		if (cwrite.good()) {
 			cwrite << "#? Config file for btop v. " << Global::Version;
-#define X(T, name, v, desc) write_field(#name, desc);
+#define X(T, name, v, desc) write_field(cwrite, #name, current.name, desc);
 			OPTIONS_WRITABLE_LIST
 #undef X
 		}
diff --git a/src/btop_config.hpp b/src/btop_config.hpp
index bdfd9b928..2d91f2f4f 100644
--- a/src/btop_config.hpp
+++ b/src/btop_config.hpp
@@ -18,6 +18,7 @@ tab-size = 4
 
 #pragma once
 
+#include "btop_tools.hpp"
 #include <string>
 #include <vector>
 #include <filesystem>
@@ -196,9 +197,10 @@ using robin_hood::unordered_flat_map;
 
 #define OPTIONS_LIST OPTIONS_WRITABLE_LIST OPTIONS_INTERNAL_LIST
 
+#define CONFIG_OFFSET(name) offsetof(Config::ConfigSet, name)
 #define CONFIG_SET(name, v) Config::set< \
 	decltype(std::declval<Config::ConfigSet>().name) \
->(offsetof(Config::ConfigSet, name), #name, v, Config::is_writable(#name))
+>(CONFIG_OFFSET(name), v, Config::is_writable(#name))
 
 //* Functions and variables for reading and writing the btop config file
 namespace Config {
@@ -226,12 +228,6 @@ namespace Config {
 		};
 	}
 
-	struct ParseData {
-		// Offset will be 32bit to save space/make this fit in a register
-		uint32_t offset;
-		ConfigType type;
-	};
-
 	struct ConfigSet {
 #define X(T, name, v, desc) T name;
 		OPTIONS_LIST
@@ -246,10 +242,21 @@ namespace Config {
 		}
 	};
 
+	struct ParseData {
+		// Offset will be 32bit to save space/make this fit in a register
+		uint32_t offset;
+		ConfigType type;
+	};
+
+	template<typename T>
+	constexpr inline ConfigType type_enum() {
+		return details::TypeToEnum<T>::value;
+	}
+
 	const unordered_flat_map<std::string_view, ParseData> parse_table = {
 #define X(T, name, v, desc) { #name, { \
-		.offset = offsetof(ConfigSet, name), \
-		.type = Config::details::TypeToEnum<decltype(std::declval<ConfigSet>().name)>::value, \
+		.offset = CONFIG_OFFSET(name), \
+		.type = Config::type_enum<decltype(std::declval<ConfigSet>().name)>(), \
 	} },
 		OPTIONS_LIST
 #undef X
@@ -267,7 +274,7 @@ namespace Config {
 	extern vector<string> preset_list;
 	extern vector<string> available_batteries;
 	extern int current_preset;
-	extern robin_hood::unordered_flat_set<std::string_view> cached;
+	extern unordered_flat_map<uint32_t, ConfigType> cached;
 
 	constexpr static bool is_writable(const std::string_view option) {
 #define X(T, name, v, desc) if(option == #name) return false;
@@ -297,7 +304,7 @@ namespace Config {
 
 	bool _locked();
 
-	string getAsString(const std::string_view name);
+	string getAsString(const size_t offset);
 
 	template<typename T>
 	inline const T& dynamic_get(const ConfigSet& src, size_t offset) {
@@ -310,18 +317,103 @@ namespace Config {
 	}
 
 	template<typename T>
-	void set(const size_t offset, const std::string_view name, const T& value, const bool writable) {
+	void set(const size_t offset, const T& value, const bool writable) {
 		bool locked = _locked();
 		auto& set = get_mut(locked, writable);
 		if(locked)
-			cached.insert(name);
+			cached[offset] =  type_enum<T>();
 		dynamic_set(set, offset, value);
 	}
 
+	namespace details {
+		template<typename T>
+		inline string to_string(const ConfigSet& set, const size_t offset);
+
+		template<>
+		inline string to_string<bool>(const ConfigSet& set, const size_t offset) {
+			return dynamic_get<bool>(set, offset) ? "True" : "False";
+		}
+
+		template<>
+		inline string to_string<int>(const ConfigSet& set, const size_t offset) {
+			return std::to_string(dynamic_get<int>(set, offset));
+		}
+
+		template<>
+		inline string to_string<string>(const ConfigSet& set, const size_t offset) {
+			return dynamic_get<string>(set, offset);
+		}
+	}
+
 	extern string validError;
 
-	bool intValid(const std::string_view name, const string& value);
-	bool stringValid(const std::string_view name, const string& value);
+	//* Converts string to int. True on success, false on error.
+	bool to_int(const string& value, int& result);
+
+	template<typename T>
+	bool validate(const size_t offset, const T& value, const bool setError = true) {
+		using namespace Tools;
+		bool isValid = true;
+
+#define VALIDATE(name, cond, err) case CONFIG_OFFSET(name): \
+		isValid = (cond); \
+		if(setError and not isValid) { \
+			validError = (err); \
+		} \
+		break
+
+		if constexpr(std::is_same_v<T, int>) {
+			switch(offset) {
+				VALIDATE(update_ms, value >= 100 && value <= 86400000,
+						"Config value update_ms out of range (100 <= x <= 86400000)");
+			}
+		}
+
+		if constexpr(std::is_same_v<T, string>) {
+			switch(offset) {
+				VALIDATE(log_level, Tools::v_contains(Logger::log_levels, value),
+						"Invalid log level: " + value);
+				VALIDATE(graph_symbol, Tools::v_contains(valid_graph_symbols, value),
+						"Invalid graph symbol identifier: " + value);
+				VALIDATE(graph_symbol_proc, value == "default" || v_contains(valid_graph_symbols, value),
+						"Invalid graph symbol identifier for graph_symbol_proc: " + value);
+				VALIDATE(graph_symbol_cpu, value == "default" || v_contains(valid_graph_symbols, value),
+						"Invalid graph symbol identifier for graph_symbol_cpu: " + value);
+				VALIDATE(graph_symbol_mem, value == "default" || v_contains(valid_graph_symbols, value),
+						"Invalid graph symbol identifier for graph_symbol_mem: " + value);
+				VALIDATE(graph_symbol_net, value == "default" || v_contains(valid_graph_symbols, value),
+						"Invalid graph symbol identifier for graph_symbol_net: " + value);
+				VALIDATE(shown_boxes, value.empty() || check_boxes(value),
+						"Invalid box_name(s) in shown_boxes");
+				VALIDATE(cpu_core_map, [&]{
+					const auto maps = ssplit(value);
+					for (const auto& map : maps) {
+						const auto map_split = ssplit(map, ':');
+						if (map_split.size() != 2 || not isint(map_split.at(0)) or not isint(map_split.at(1)))
+							return false;
+					}
+					return true;
+				}(), "Invalid formatting of cpu_core_map!");
+				VALIDATE(io_graph_speeds, [&]{
+					const auto maps = ssplit(value);
+					for (const auto& map : maps) {
+						const auto map_split = ssplit(map, ':');
+						if (map_split.size() != 2 || map_split.at(0).empty() or not isint(map_split.at(1)))
+							return false;
+					}
+					return true;
+				}(), "Invalid formatting of io_graph_speeds!");
+
+				case CONFIG_OFFSET(presets):
+					return presetsValid(value);
+			}
+		}
+
+#undef VALIDATE
+
+		return isValid;
+
+	}
 
 	//* Lock config and cache changes until unlocked
 	void lock();
diff --git a/src/btop_menu.cpp b/src/btop_menu.cpp
index 3d38daa24..471ae1408 100644
--- a/src/btop_menu.cpp
+++ b/src/btop_menu.cpp
@@ -23,6 +23,7 @@ tab-size = 4
 #include <errno.h>
 #include <cmath>
 #include <filesystem>
+#include <string_view>
 
 #include "btop_menu.hpp"
 #include "btop_tools.hpp"
@@ -31,6 +32,8 @@ tab-size = 4
 #include "btop_draw.hpp"
 #include "btop_shared.hpp"
 
+#define ASIZE(a) (sizeof(a)/sizeof(*a))
+
 using robin_hood::unordered_flat_map;
 using std::array;
 using std::ceil;
@@ -43,8 +46,57 @@ using namespace Tools;
 
 namespace fs = std::filesystem;
 
-namespace Menu {
+enum Predispositions { isBool, isInt, isString, is2D, isBrowseable, isEditable};
+struct MenuEntry {
+	std::bitset<8> info;
+	uint32_t offset;
+	const vector<std::string> *browse_values{};
+	const vector<std::string_view> content;
+};
+
+template<typename T>
+constexpr std::bitset<8> make_info(const bool browsable) {
+	std::bitset<8> s;
+	switch(Config::type_enum<T>()) {
+		case Config::ConfigType::BOOL:
+			s.set(isBool);
+			break;
+		case Config::ConfigType::INT:
+			s.set(isInt);
+			break;
+		case Config::ConfigType::STRING:
+			s.set(isString);
+			break;
+	}
+
+	if(not s.test(isString)) {
+		s.set(is2D);
+	}
+
+	if(browsable) {
+		s.set(isBrowseable);
+	} else if(s.test(isString) or s.test(isInt)) {
+		s.set(isEditable);
+	}
+
+	return s;
+}
+
+#define MENU_ENTRY(name, ...) { \
+	.info = make_info<decltype(std::declval<Config::ConfigSet>().name)>(false), \
+	.offset = CONFIG_OFFSET(name), \
+	.content = { #name, __VA_ARGS__ }, \
+}
+
+#define MENU_BROWSABLE_ENTRY(name, src, ...) { \
+	.info = make_info<decltype(std::declval<Config::ConfigSet>().name)>(true), \
+	.offset = CONFIG_OFFSET(name), \
+	.browse_values = &(src), \
+	.content = { #name, __VA_ARGS__ }, \
+}
 
+
+namespace Menu {
    atomic<bool> active (false);
    string bg;
    bool redraw{true};
@@ -163,7 +215,7 @@ namespace Menu {
 
 	const array<int, 3> menu_width = {19, 12, 12};
 
-	const vector<array<string, 2>> help_text = {
+	const string help_text[][2] = {
 		{"Mouse 1", "Clicks buttons and selects in process list."},
 		{"Mouse scroll", "Scrolls any scrollable list/text under cursor."},
 		{"Esc, m", "Toggles main menu."},
@@ -205,489 +257,488 @@ namespace Menu {
 		{"", "https://github.com/aristocratos/btop"},
 	};
 
-	const vector<vector<vector<string>>> categories = {
+	const std::array<vector<MenuEntry>, 5> categories{{
 		{
-			{"color_theme",
-				"Set color theme.",
-				"",
-				"Choose from all theme files in (usually)",
-				"\"/usr/[local/]share/btop/themes\" and",
-				"\"~/.config/btop/themes\".",
-				"",
-				"\"Default\" for builtin default theme.",
-				"\"TTY\" for builtin 16-color theme.",
-				"",
-				"For theme updates see:",
-				"https://github.com/aristocratos/btop"},
-			{"theme_background",
-				"If the theme set background should be shown.",
-				"",
-				"Set to False if you want terminal background",
-				"transparency."},
-			{"truecolor",
-				"Sets if 24-bit truecolor should be used.",
-				"",
-				"Will convert 24-bit colors to 256 color",
-				"(6x6x6 color cube) if False.",
-				"",
-				"Set to False if your terminal doesn't have",
-				"truecolor support and can't convert to",
-				"256-color."},
-			{"force_tty",
-				"TTY mode.",
-				"",
-				"Set to true to force tty mode regardless",
-				"if a real tty has been detected or not.",
-				"",
-				"Will force 16-color mode and TTY theme,",
-				"set all graph symbols to \"tty\" and swap",
-				"out other non tty friendly symbols."},
-			{"vim_keys",
-				"Enable vim keys.",
-				"Set to True to enable \"h,j,k,l\" keys for",
-				"directional control in lists.",
-				"",
-				"Conflicting keys for",
-				"h (help) and k (kill)",
-				"is accessible while holding shift."},
-
-			{"presets",
-				"Define presets for the layout of the boxes.",
-				"",
-				"Preset 0 is always all boxes shown with",
-				"default settings.",
-				"Max 9 presets.",
-				"",
-				"Format: \"box_name:P:G,box_name:P:G\"",
-				"P=(0 or 1) for alternate positions.",
-				"G=graph symbol to use for box.",
-				"",
-				"Use whitespace \" \" as separator between",
-				"different presets.",
-				"",
-				"Example:",
-				"\"mem:0:tty,proc:1:default cpu:0:braille\""},
-			{"shown_boxes",
-				"Manually set which boxes to show.",
-				"",
-				"Available values are \"cpu mem net proc\".",
-				"Separate values with whitespace.",
-				"",
-				"Toggle between presets with key \"p\"."},
-			{"update_ms",
-				"Update time in milliseconds.",
-				"",
-				"Recommended 2000 ms or above for better",
-				"sample times for graphs.",
-				"",
-				"Min value: 100 ms",
-				"Max value: 86400000 ms = 24 hours."},
-			{"rounded_corners",
-				"Rounded corners on boxes.",
-				"",
-				"True or False",
-				"",
-				"Is always False if TTY mode is ON."},
-			{"graph_symbol",
-				"Default symbols to use for graph creation.",
-				"",
-				"\"braille\", \"block\" or \"tty\".",
-				"",
-				"\"braille\" offers the highest resolution but",
-				"might not be included in all fonts.",
-				"",
-				"\"block\" has half the resolution of braille",
-				"but uses more common characters.",
-				"",
-				"\"tty\" uses only 3 different symbols but will",
-				"work with most fonts.",
-				"",
-				"Note that \"tty\" only has half the horizontal",
-				"resolution of the other two,",
-				"so will show a shorter historical view."},
-			{"clock_format",
-				"Draw a clock at top of screen.",
-				"(Only visible if cpu box is enabled!)",
-				"",
-				"Formatting according to strftime, empty",
-				"string to disable.",
-				"",
-				"Custom formatting options:",
-				"\"/host\" = hostname",
-				"\"/user\" = username",
-				"\"/uptime\" = system uptime",
-				"",
-				"Examples of strftime formats:",
-				"\"%X\" = locale HH:MM:SS",
-				"\"%H\" = 24h hour, \"%I\" = 12h hour",
-				"\"%M\" = minute, \"%S\" = second",
-				"\"%d\" = day, \"%m\" = month, \"%y\" = year"},
-			{"base_10_sizes",
-				"Use base 10 for bits and bytes sizes.",
-				"",
-				"Uses KB = 1000 instead of KiB = 1024,",
-				"MB = 1000KB instead of MiB = 1024KiB,",
-				"and so on.",
-				"",
-				"True or False."},
-			{"background_update",
-				"Update main ui when menus are showing.",
-				"",
-				"True or False.",
-				"",
-				"Set this to false if the menus is flickering",
-				"too much for a comfortable experience."},
-			{"show_battery",
-				"Show battery stats.",
-				"(Only visible if cpu box is enabled!)",
-				"",
-				"Show battery stats in the top right corner",
-				"if a battery is present."},
-			{"selected_battery",
-				"Select battery.",
-				"",
-				"Which battery to use if multiple are present.",
-				"Can be both batteries and UPS.",
-				"",
-				"\"Auto\" for auto detection."},
-			{"log_level",
-				"Set loglevel for error.log",
-				"",
-				"\"ERROR\", \"WARNING\", \"INFO\" and \"DEBUG\".",
-				"",
-				"The level set includes all lower levels,",
-				"i.e. \"DEBUG\" will show all logging info."}
+			MENU_BROWSABLE_ENTRY(color_theme, Theme::themes,
+					"Set color theme.",
+					"",
+					"Choose from all theme files in (usually)",
+					"\"/usr/[local/]share/btop/themes\" and",
+					"\"~/.config/btop/themes\".",
+					"",
+					"\"Default\" for builtin default theme.",
+					"\"TTY\" for builtin 16-color theme.",
+					"",
+					"For theme updates see:",
+					"https://github.com/aristocratos/btop"),
+			MENU_ENTRY(theme_background,
+					"If the theme set background should be shown.",
+					"",
+					"Set to False if you want terminal background",
+					"transparency."),
+			MENU_ENTRY(truecolor,
+					"Sets if 24-bit truecolor should be used.",
+					"",
+					"Will convert 24-bit colors to 256 color",
+					"(6x6x6 color cube) if False.",
+					"",
+					"Set to False if your terminal doesn't have",
+					"truecolor support and can't convert to",
+					"256-color."),
+			MENU_ENTRY(force_tty,
+					"TTY mode.",
+					"",
+					"Set to true to force tty mode regardless",
+					"if a real tty has been detected or not.",
+					"",
+					"Will force 16-color mode and TTY theme,",
+					"set all graph symbols to \"tty\" and swap",
+					"out other non tty friendly symbols."),
+			MENU_ENTRY(vim_keys,
+					"Enable vim keys.",
+					"Set to True to enable \"h,j,k,l\" keys for",
+					"directional control in lists.",
+					"",
+					"Conflicting keys for",
+					"h (help) and k (kill)",
+					"is accessible while holding shift."),
+			MENU_ENTRY(presets,
+					"Define presets for the layout of the boxes.",
+					"",
+					"Preset 0 is always all boxes shown with",
+					"default settings.",
+					"Max 9 presets.",
+					"",
+					"Format: \"box_name:P:G,box_name:P:G\"",
+					"P=(0 or 1) for alternate positions.",
+					"G=graph symbol to use for box.",
+					"",
+					"Use whitespace \" \" as separator between",
+					"different presets.",
+					"",
+					"Example:",
+					"\"mem:0:tty,proc:1:default cpu:0:braille\""),
+			MENU_ENTRY(shown_boxes,
+					"Manually set which boxes to show.",
+					"",
+					"Available values are \"cpu mem net proc\".",
+					"Separate values with whitespace.",
+					"",
+					"Toggle between presets with key \"p\"."),
+			MENU_ENTRY(update_ms,
+					"Update time in milliseconds.",
+					"",
+					"Recommended 2000 ms or above for better",
+					"sample times for graphs.",
+					"",
+					"Min value: 100 ms",
+					"Max value: 86400000 ms = 24 hours."),
+			MENU_ENTRY(rounded_corners,
+					"Rounded corners on boxes.",
+					"",
+					"True or False",
+					"",
+					"Is always False if TTY mode is ON."),
+			MENU_BROWSABLE_ENTRY(graph_symbol, Config::valid_graph_symbols,
+					"Default symbols to use for graph creation.",
+					"",
+					"\"braille\", \"block\" or \"tty\".",
+					"",
+					"\"braille\" offers the highest resolution but",
+					"might not be included in all fonts.",
+					"",
+					"\"block\" has half the resolution of braille",
+					"but uses more common characters.",
+					"",
+					"\"tty\" uses only 3 different symbols but will",
+					"work with most fonts.",
+					"",
+					"Note that \"tty\" only has half the horizontal",
+					"resolution of the other two,",
+					"so will show a shorter historical view."),
+			MENU_ENTRY(clock_format,
+					"Draw a clock at top of screen.",
+					"(Only visible if cpu box is enabled!)",
+					"",
+					"Formatting according to strftime, empty",
+					"string to disable.",
+					"",
+					"Custom formatting options:",
+					"\"/host\" = hostname",
+					"\"/user\" = username",
+					"\"/uptime\" = system uptime",
+					"",
+					"Examples of strftime formats:",
+					"\"%X\" = locale HH:MM:SS",
+					"\"%H\" = 24h hour, \"%I\" = 12h hour",
+					"\"%M\" = minute, \"%S\" = second",
+					"\"%d\" = day, \"%m\" = month, \"%y\" = year"),
+			MENU_ENTRY(base_10_sizes,
+					"Use base 10 for bits and bytes sizes.",
+					"",
+					"Uses KB = 1000 instead of KiB = 1024,",
+					"MB = 1000KB instead of MiB = 1024KiB,",
+					"and so on.",
+					"",
+					"True or False."),
+			MENU_ENTRY(background_update,
+					"Update main ui when menus are showing.",
+					"",
+					"True or False.",
+					"",
+					"Set this to false if the menus is flickering",
+					"too much for a comfortable experience."),
+			MENU_ENTRY(show_battery,
+					"Show battery stats.",
+					"(Only visible if cpu box is enabled!)",
+					"",
+					"Show battery stats in the top right corner",
+					"if a battery is present."),
+			MENU_BROWSABLE_ENTRY(selected_battery, Config::available_batteries,
+					"Select battery.",
+					"",
+					"Which battery to use if multiple are present.",
+					"Can be both batteries and UPS.",
+					"",
+					"\"Auto\" for auto detection."),
+			MENU_BROWSABLE_ENTRY(log_level, Logger::log_levels,
+					"Set loglevel for error.log",
+					"",
+					"\"ERROR\", \"WARNING\", \"INFO\" and \"DEBUG\".",
+					"",
+					"The level set includes all lower levels,",
+					"i.e. \"DEBUG\" will show all logging info."),
 		},
 		{
-			{"cpu_bottom",
-				"Cpu box location.",
-				"",
-				"Show cpu box at bottom of screen instead",
-				"of top."},
-			{"graph_symbol_cpu",
-				"Graph symbol to use for graphs in cpu box.",
-				"",
-				"\"default\", \"braille\", \"block\" or \"tty\".",
-				"",
-				"\"default\" for the general default symbol.",},
-			{"cpu_graph_upper",
-				"Cpu upper graph.",
-				"",
-				"Sets the CPU stat shown in upper half of",
-				"the CPU graph.",
-				"",
-				"\"total\" = Total cpu usage.",
-				"\"user\" = User mode cpu usage.",
-				"\"system\" = Kernel mode cpu usage.",
-				"+ more depending on kernel."},
-			{"cpu_graph_lower",
-				"Cpu lower graph.",
-				"",
-				"Sets the CPU stat shown in lower half of",
-				"the CPU graph.",
-				"",
-				"\"total\" = Total cpu usage.",
-				"\"user\" = User mode cpu usage.",
-				"\"system\" = Kernel mode cpu usage.",
-				"+ more depending on kernel."},
-			{"cpu_invert_lower",
+			MENU_ENTRY(cpu_bottom,
+					"Cpu box location.",
+					"",
+					"Show cpu box at bottom of screen instead",
+					"of top."),
+			MENU_BROWSABLE_ENTRY(graph_symbol_cpu, Config::valid_graph_symbols_def,
+					"Graph symbol to use for graphs in cpu box.",
+					"",
+					"\"default\", \"braille\", \"block\" or \"tty\".",
+					"",
+					"\"default\" for the general default symbol.",),
+			MENU_BROWSABLE_ENTRY(cpu_graph_upper, Cpu::available_fields,
+					"Cpu upper graph.",
+					"",
+					"Sets the CPU stat shown in upper half of",
+					"the CPU graph.",
+					"",
+					"\"total\" = Total cpu usage.",
+					"\"user\" = User mode cpu usage.",
+					"\"system\" = Kernel mode cpu usage.",
+					"+ more depending on kernel."),
+			MENU_BROWSABLE_ENTRY(cpu_graph_lower, Cpu::available_fields,
+					"Cpu lower graph.",
+					"",
+					"Sets the CPU stat shown in lower half of",
+					"the CPU graph.",
+					"",
+					"\"total\" = Total cpu usage.",
+					"\"user\" = User mode cpu usage.",
+					"\"system\" = Kernel mode cpu usage.",
+					"+ more depending on kernel."),
+			MENU_ENTRY(cpu_invert_lower,
 					"Toggles orientation of the lower CPU graph.",
 					"",
-					"True or False."},
-			{"cpu_single_graph",
+					"True or False."),
+			MENU_ENTRY(cpu_single_graph,
 					"Completely disable the lower CPU graph.",
 					"",
 					"Shows only upper CPU graph and resizes it",
 					"to fit to box height.",
 					"",
-					"True or False."},
-			{"check_temp",
-				"Enable cpu temperature reporting.",
-				"",
-				"True or False."},
-			{"cpu_sensor",
-				"Cpu temperature sensor",
-				"",
-				"Select the sensor that corresponds to",
-				"your cpu temperature.",
-				"",
-				"Set to \"Auto\" for auto detection."},
-			{"show_coretemp",
-				"Show temperatures for cpu cores.",
-				"",
-				"Only works if check_temp is True and",
-				"the system is reporting core temps."},
-			{"cpu_core_map",
-				"Custom mapping between core and coretemp.",
-				"",
-				"Can be needed on certain cpus to get correct",
-				"temperature for correct core.",
-				"",
-				"Use lm-sensors or similar to see which cores",
-				"are reporting temperatures on your machine.",
-				"",
-				"Format: \"X:Y\"",
-				"X=core with wrong temp.",
-				"Y=core with correct temp.",
-				"Use space as separator between multiple",
-				"entries.",
-				"",
-				"Example: \"4:0 5:1 6:3\""},
-			{"temp_scale",
-				"Which temperature scale to use.",
-				"",
-				"Celsius, default scale.",
-				"",
-				"Fahrenheit, the american one.",
-				"",
-				"Kelvin, 0 = absolute zero, 1 degree change",
-				"equals 1 degree change in Celsius.",
-				"",
-				"Rankine, 0 = abosulte zero, 1 degree change",
-				"equals 1 degree change in Fahrenheit."},
-			{"show_cpu_freq",
-				"Show CPU frequency",
-				"",
-				"Can cause slowdowns on systems with many",
-				"cores and certain kernel versions."},
-			{"custom_cpu_name",
-				"Custom cpu model name in cpu percentage box.",
-				"",
-				"Empty string to disable."},
-			{"show_uptime",
-				"Shows the system uptime in the CPU box.",
-				"",
-				"Can also be shown in the clock by using",
-				"\"/uptime\" in the formatting.",
-				"",
-				"True or False."},
+					"True or False."),
+			MENU_ENTRY(check_temp,
+					"Enable cpu temperature reporting.",
+					"",
+					"True or False."),
+			MENU_BROWSABLE_ENTRY(cpu_sensor, Cpu::available_sensors,
+					"Cpu temperature sensor",
+					"",
+					"Select the sensor that corresponds to",
+					"your cpu temperature.",
+					"",
+					"Set to \"Auto\" for auto detection."),
+			MENU_ENTRY(show_coretemp,
+					"Show temperatures for cpu cores.",
+					"",
+					"Only works if check_temp is True and",
+					"the system is reporting core temps."),
+			MENU_ENTRY(cpu_core_map,
+					"Custom mapping between core and coretemp.",
+					"",
+					"Can be needed on certain cpus to get correct",
+					"temperature for correct core.",
+					"",
+					"Use lm-sensors or similar to see which cores",
+					"are reporting temperatures on your machine.",
+					"",
+					"Format: \"X:Y\"",
+					"X=core with wrong temp.",
+					"Y=core with correct temp.",
+					"Use space as separator between multiple",
+					"entries.",
+					"",
+					"Example: \"4:0 5:1 6:3\""),
+			MENU_BROWSABLE_ENTRY(temp_scale, Config::temp_scales,
+					"Which temperature scale to use.",
+					"",
+					"Celsius, default scale.",
+					"",
+					"Fahrenheit, the american one.",
+					"",
+					"Kelvin, 0 = absolute zero, 1 degree change",
+					"equals 1 degree change in Celsius.",
+					"",
+					"Rankine, 0 = abosulte zero, 1 degree change",
+					"equals 1 degree change in Fahrenheit."),
+			MENU_ENTRY(show_cpu_freq,
+					"Show CPU frequency",
+					"",
+					"Can cause slowdowns on systems with many",
+					"cores and certain kernel versions."),
+			MENU_ENTRY(custom_cpu_name,
+					"Custom cpu model name in cpu percentage box.",
+					"",
+					"Empty string to disable."),
+			MENU_ENTRY(show_uptime,
+					"Shows the system uptime in the CPU box.",
+					"",
+					"Can also be shown in the clock by using",
+					"\"/uptime\" in the formatting.",
+					"",
+					"True or False."),
 		},
 		{
-			{"mem_below_net",
-				"Mem box location.",
-				"",
-				"Show mem box below net box instead of above."},
-			{"graph_symbol_mem",
-				"Graph symbol to use for graphs in mem box.",
-				"",
-				"\"default\", \"braille\", \"block\" or \"tty\".",
-				"",
-				"\"default\" for the general default symbol.",},
-			{"mem_graphs",
-				"Show graphs for memory values.",
-				"",
-				"True or False."},
-			{"show_disks",
-				"Split memory box to also show disks.",
-				"",
-				"True or False."},
-			{"show_io_stat",
-				"Toggle IO activity graphs.",
-				"",
-				"Show small IO graphs that for disk activity",
-				"(disk busy time) when not in IO mode.",
-				"",
-				"True or False."},
-			{"io_mode",
-				"Toggles io mode for disks.",
-				"",
-				"Shows big graphs for disk read/write speeds",
-				"instead of used/free percentage meters.",
-				"",
-				"True or False."},
-			{"io_graph_combined",
-				"Toggle combined read and write graphs.",
-				"",
-				"Only has effect if \"io mode\" is True.",
-				"",
-				"True or False."},
-			{"io_graph_speeds",
-				"Set top speeds for the io graphs.",
-				"",
-				"Manually set which speed in MiB/s that",
-				"equals 100 percent in the io graphs.",
-				"(100 MiB/s by default).",
-				"",
-				"Format: \"device:speed\" separate disks with",
-				"whitespace \" \".",
-				"",
-				"Example: \"/dev/sda:100, /dev/sdb:20\"."},
-			{"show_swap",
-				"If swap memory should be shown in memory box.",
-				"",
-				"True or False."},
-			{"swap_disk",
-				"Show swap as a disk.",
-				"",
-				"Ignores show_swap value above.",
-				"Inserts itself after first disk."},
-			{"only_physical",
-				"Filter out non physical disks.",
-				"",
-				"Set this to False to include network disks,",
-				"RAM disks and similar.",
-				"",
-				"True or False."},
-			{"use_fstab",
-				"(Linux) Read disks list from /etc/fstab.",
-				"",
-				"This also disables only_physical.",
-				"",
-				"True or False."},
-			{"zfs_hide_datasets",
-				"(Linux) Hide ZFS datasets in disks list.",
-				"",
-				"Setting this to True will hide all datasets,",
-				"and only show ZFS pools.",
-				"",
-				"(IO stats will be calculated per-pool)",
-				"",
-				"True or False."},
-			{"disk_free_priv",
-				"(Linux) Type of available disk space.",
-				"",
-				"Set to true to show how much disk space is",
-				"available for privileged users.",
-				"",
-				"Set to false to show available for normal",
-				"users."},
-			{"disks_filter",
-				"Optional filter for shown disks.",
-				"",
-				"Should be full path of a mountpoint.",
-				"Separate multiple values with",
-				"whitespace \" \".",
-				"",
-				"Begin line with \"exclude=\" to change to",
-				"exclude filter.",
-				"Oterwise defaults to \"most include\" filter.",
-				"",
-				"Example:",
-				"\"exclude=/boot /home/user\""},
-			{"zfs_arc_cached",
-				"(Linux) Count ZFS ARC as cached memory.",
-				"",
-				"Add ZFS ARC used to cached memory and",
-				"ZFS ARC available to available memory.",
-				"These are otherwise reported by the Linux",
-				"kernel as used memory.",
-				"",
-				"True or False."},
+			MENU_ENTRY(mem_below_net,
+					"Mem box location.",
+					"",
+					"Show mem box below net box instead of above."),
+			MENU_BROWSABLE_ENTRY(graph_symbol_mem, Config::valid_graph_symbols_def,
+					"Graph symbol to use for graphs in mem box.",
+					"",
+					"\"default\", \"braille\", \"block\" or \"tty\".",
+					"",
+					"\"default\" for the general default symbol.",),
+			MENU_ENTRY(mem_graphs,
+					"Show graphs for memory values.",
+					"",
+					"True or False."),
+			MENU_ENTRY(show_disks,
+					"Split memory box to also show disks.",
+					"",
+					"True or False."),
+			MENU_ENTRY(show_io_stat,
+					"Toggle IO activity graphs.",
+					"",
+					"Show small IO graphs that for disk activity",
+					"(disk busy time) when not in IO mode.",
+					"",
+					"True or False."),
+			MENU_ENTRY(io_mode,
+					"Toggles io mode for disks.",
+					"",
+					"Shows big graphs for disk read/write speeds",
+					"instead of used/free percentage meters.",
+					"",
+					"True or False."),
+			MENU_ENTRY(io_graph_combined,
+					"Toggle combined read and write graphs.",
+					"",
+					"Only has effect if \"io mode\" is True.",
+					"",
+					"True or False."),
+			MENU_ENTRY(io_graph_speeds,
+					"Set top speeds for the io graphs.",
+					"",
+					"Manually set which speed in MiB/s that",
+					"equals 100 percent in the io graphs.",
+					"(100 MiB/s by default).",
+					"",
+					"Format: \"device:speed\" separate disks with",
+					"whitespace \" \".",
+					"",
+					"Example: \"/dev/sda:100, /dev/sdb:20\"."),
+			MENU_ENTRY(show_swap,
+					"If swap memory should be shown in memory box.",
+					"",
+					"True or False."),
+			MENU_ENTRY(swap_disk,
+					"Show swap as a disk.",
+					"",
+					"Ignores show_swap value above.",
+					"Inserts itself after first disk."),
+			MENU_ENTRY(only_physical,
+					"Filter out non physical disks.",
+					"",
+					"Set this to False to include network disks,",
+					"RAM disks and similar.",
+					"",
+					"True or False."),
+			MENU_ENTRY(use_fstab,
+					"(Linux) Read disks list from /etc/fstab.",
+					"",
+					"This also disables only_physical.",
+					"",
+					"True or False."),
+			MENU_ENTRY(zfs_hide_datasets,
+					"(Linux) Hide ZFS datasets in disks list.",
+					"",
+					"Setting this to True will hide all datasets,",
+					"and only show ZFS pools.",
+					"",
+					"(IO stats will be calculated per-pool)",
+					"",
+					"True or False."),
+			MENU_ENTRY(disk_free_priv,
+					"(Linux) Type of available disk space.",
+					"",
+					"Set to true to show how much disk space is",
+					"available for privileged users.",
+					"",
+					"Set to false to show available for normal",
+					"users."),
+			MENU_ENTRY(disks_filter,
+					"Optional filter for shown disks.",
+					"",
+					"Should be full path of a mountpoint.",
+					"Separate multiple values with",
+					"whitespace \" \".",
+					"",
+					"Begin line with \"exclude=\" to change to",
+					"exclude filter.",
+					"Oterwise defaults to \"most include\" filter.",
+					"",
+					"Example:",
+					"\"exclude=/boot /home/user\""),
+			MENU_ENTRY(zfs_arc_cached,
+					"(Linux) Count ZFS ARC as cached memory.",
+					"",
+					"Add ZFS ARC used to cached memory and",
+					"ZFS ARC available to available memory.",
+					"These are otherwise reported by the Linux",
+					"kernel as used memory.",
+					"",
+					"True or False."),
 		},
 		{
-			{"graph_symbol_net",
-				"Graph symbol to use for graphs in net box.",
-				"",
-				"\"default\", \"braille\", \"block\" or \"tty\".",
-				"",
-				"\"default\" for the general default symbol.",},
-			{"net_download",
-				"Fixed network graph download value.",
-				"",
-				"Value in Mebibits, default \"100\".",
-				"",
-				"Can be toggled with auto button."},
-			{"net_upload",
-				"Fixed network graph upload value.",
-				"",
-				"Value in Mebibits, default \"100\".",
-				"",
-				"Can be toggled with auto button."},
-			{"net_auto",
-				"Start in network graphs auto rescaling mode.",
-				"",
-				"Ignores any values set above at start and",
-				"rescales down to 10Kibibytes at the lowest.",
-				"",
-				"True or False."},
-			{"net_sync",
-				"Network scale sync.",
-				"",
-				"Syncs the scaling for download and upload to",
-				"whichever currently has the highest scale.",
-				"",
-				"True or False."},
-			{"net_iface",
-				"Network Interface.",
-				"",
-				"Manually set the starting Network Interface.",
-				"",
-				"Will otherwise automatically choose the NIC",
-				"with the highest total download since boot."},
+			MENU_BROWSABLE_ENTRY(graph_symbol_net, Config::valid_graph_symbols_def,
+					"Graph symbol to use for graphs in net box.",
+					"",
+					"\"default\", \"braille\", \"block\" or \"tty\".",
+					"",
+					"\"default\" for the general default symbol.",),
+			MENU_ENTRY(net_download,
+					"Fixed network graph download value.",
+					"",
+					"Value in Mebibits, default \"100\".",
+					"",
+					"Can be toggled with auto button."),
+			MENU_ENTRY(net_upload,
+					"Fixed network graph upload value.",
+					"",
+					"Value in Mebibits, default \"100\".",
+					"",
+					"Can be toggled with auto button."),
+			MENU_ENTRY(net_auto,
+					"Start in network graphs auto rescaling mode.",
+					"",
+					"Ignores any values set above at start and",
+					"rescales down to 10Kibibytes at the lowest.",
+					"",
+					"True or False."),
+			MENU_ENTRY(net_sync,
+					"Network scale sync.",
+					"",
+					"Syncs the scaling for download and upload to",
+					"whichever currently has the highest scale.",
+					"",
+					"True or False."),
+			MENU_ENTRY(net_iface,
+					"Network Interface.",
+					"",
+					"Manually set the starting Network Interface.",
+					"",
+					"Will otherwise automatically choose the NIC",
+					"with the highest total download since boot."),
 		},
 		{
-			{"proc_left",
-				"Proc box location.",
-				"",
-				"Show proc box on left side of screen",
-				"instead of right."},
-			{"graph_symbol_proc",
-				"Graph symbol to use for graphs in proc box.",
-				"",
-				"\"default\", \"braille\", \"block\" or \"tty\".",
-				"",
-				"\"default\" for the general default symbol.",},
-			{"proc_sorting",
-				"Processes sorting option.",
-				"",
-				"Possible values:",
-				"\"pid\", \"program\", \"arguments\", \"threads\",",
-				"\"user\", \"memory\", \"cpu lazy\" and",
-				"\"cpu direct\".",
-				"",
-				"\"cpu lazy\" updates top process over time.",
-				"\"cpu direct\" updates top process",
-				"directly."},
-			{"proc_reversed",
-				"Reverse processes sorting order.",
-				"",
-				"True or False."},
-			{"proc_tree",
-				"Processes tree view.",
-				"",
-				"Set true to show processes grouped by",
-				"parents with lines drawn between parent",
-				"and child process."},
-			{"proc_aggregate",
-				"Aggregate child's resources in parent.",
-				"",
-				"In tree-view, include all child resources",
-				"with the parent even while expanded."},
-			{"proc_colors",
-				"Enable colors in process view.",
-				"",
-				"True or False."},
-			{"proc_gradient",
-				"Enable process view gradient fade.",
-				"",
-				"Fades from top or current selection.",
-				"Max fade value is equal to current themes",
-				"\"inactive_fg\" color value."},
-			{"proc_per_core",
-				"Process usage per core.",
-				"",
-				"If process cpu usage should be of the core",
-				"it's running on or usage of the total",
-				"available cpu power.",
-				"",
-				"If true and process is multithreaded",
-				"cpu usage can reach over 100%."},
-			{"proc_mem_bytes",
-				"Show memory as bytes in process list.",
-				" ",
-				"Will show percentage of total memory",
-				"if False."},
-			{"proc_cpu_graphs",
-				"Show cpu graph for each process.",
-				"",
-				"True or False"},
-			{"proc_filter_kernel",
-				"(Linux) Filter kernel processes from output.",
-				"",
-				"Set to 'True' to filter out internal",
-				"processes started by the Linux kernel."},
-		}
-	};
+			MENU_ENTRY(proc_left,
+					"Proc box location.",
+					"",
+					"Show proc box on left side of screen",
+					"instead of right."),
+			MENU_BROWSABLE_ENTRY(graph_symbol_proc, Config::valid_graph_symbols_def,
+					"Graph symbol to use for graphs in proc box.",
+					"",
+					"\"default\", \"braille\", \"block\" or \"tty\".",
+					"",
+					"\"default\" for the general default symbol.",),
+			MENU_BROWSABLE_ENTRY(proc_sorting, Proc::sort_vector,
+					"Processes sorting option.",
+					"",
+					"Possible values:",
+					"\"pid\", \"program\", \"arguments\", \"threads\",",
+					"\"user\", \"memory\", \"cpu lazy\" and",
+					"\"cpu direct\".",
+					"",
+					"\"cpu lazy\" updates top process over time.",
+					"\"cpu direct\" updates top process",
+					"directly."),
+			MENU_ENTRY(proc_reversed,
+					"Reverse processes sorting order.",
+					"",
+					"True or False."),
+			MENU_ENTRY(proc_tree,
+					"Processes tree view.",
+					"",
+					"Set true to show processes grouped by",
+					"parents with lines drawn between parent",
+					"and child process."),
+			MENU_ENTRY(proc_aggregate,
+					"Aggregate child's resources in parent.",
+					"",
+					"In tree-view, include all child resources",
+					"with the parent even while expanded."),
+			MENU_ENTRY(proc_colors,
+					"Enable colors in process view.",
+					"",
+					"True or False."),
+			MENU_ENTRY(proc_gradient,
+					"Enable process view gradient fade.",
+					"",
+					"Fades from top or current selection.",
+					"Max fade value is equal to current themes",
+					"\"inactive_fg\" color value."),
+			MENU_ENTRY(proc_per_core,
+					"Process usage per core.",
+					"",
+					"If process cpu usage should be of the core",
+					"it's running on or usage of the total",
+					"available cpu power.",
+					"",
+					"If true and process is multithreaded",
+					"cpu usage can reach over 100%."),
+			MENU_ENTRY(proc_mem_bytes,
+					"Show memory as bytes in process list.",
+					" ",
+					"Will show percentage of total memory",
+					"if False."),
+			MENU_ENTRY(proc_cpu_graphs,
+					"Show cpu graph for each process.",
+					"",
+					"True or False"),
+			MENU_ENTRY(proc_filter_kernel,
+					"(Linux) Filter kernel processes from output.",
+					"",
+					"Set to 'True' to filter out internal",
+					"processes started by the Linux kernel."),
+		},
+	}};
 
 	msgBox::msgBox() {}
 	msgBox::msgBox(int width, int boxtype, vector<string> content, string title)
@@ -1067,7 +1118,6 @@ namespace Menu {
 	}
 
 	int optionsMenu(const string& key) {
-		enum Predispositions { isBool, isInt, isString, is2D, isBrowseable, isEditable};
 		static int y{};                 // defaults to 0
 		static int x{};                 // defaults to 0
 		static int height{};            // defaults to 0
@@ -1083,21 +1133,6 @@ namespace Menu {
 		static Draw::TextEdit editor;
 		static string warnings;
 		static bitset<8> selPred;
-		static const unordered_flat_map<string, std::reference_wrapper<const vector<string>>> optionsList = {
-			{"color_theme", std::cref(Theme::themes)},
-			{"log_level", std::cref(Logger::log_levels)},
-			{"temp_scale", std::cref(Config::temp_scales)},
-			{"proc_sorting", std::cref(Proc::sort_vector)},
-			{"graph_symbol", std::cref(Config::valid_graph_symbols)},
-			{"graph_symbol_cpu", std::cref(Config::valid_graph_symbols_def)},
-			{"graph_symbol_mem", std::cref(Config::valid_graph_symbols_def)},
-			{"graph_symbol_net", std::cref(Config::valid_graph_symbols_def)},
-			{"graph_symbol_proc", std::cref(Config::valid_graph_symbols_def)},
-			{"cpu_graph_upper", std::cref(Cpu::available_fields)},
-			{"cpu_graph_lower", std::cref(Cpu::available_fields)},
-			{"cpu_sensor", std::cref(Cpu::available_sensors)},
-			{"selected_battery", std::cref(Config::available_batteries)},
-		};
 		auto& config = Config::get();
 		auto tty_mode = config.tty_mode;
 		auto vim_keys = config.vim_keys;
@@ -1146,26 +1181,31 @@ namespace Menu {
 				editing = false;
 			}
 			else if (key == "enter") {
-				const auto& option = categories[selected_cat][item_height * page + selected][0];
-				auto& entry = Config::parse_table.at(option);
-				if (selPred.test(isString) and Config::stringValid(option, editor.text)) {
-					Config::set<string>(entry.offset, option, editor.text, true);
-					if (option == "custom_cpu_name") screen_redraw = true;
-					else if (is_in(option, "shown_boxes", "presets")) {
-						screen_redraw = true;
-						Config::current_preset = -1;
-					}
-					else if (option == "clock_format") {
-						Draw::update_clock(true);
-						screen_redraw = true;
-					}
-					else if (option == "cpu_core_map") {
-						atomic_wait(Runner::active);
-						Cpu::core_mapping = Cpu::get_core_mapping();
+				const auto& option = categories[selected_cat][item_height * page + selected];
+				int intValue;
+				if (selPred.test(isString) and Config::validate(option.offset, editor.text)) {
+					Config::set<string>(option.offset, editor.text, true);
+					switch(option.offset) {
+						case CONFIG_OFFSET(custom_cpu_name):
+							screen_redraw = true;
+							break;
+						case CONFIG_OFFSET(shown_boxes):
+						case CONFIG_OFFSET(presets):
+							screen_redraw = true;
+							Config::current_preset = -1;
+							break;
+						case CONFIG_OFFSET(clock_format):
+							Draw::update_clock(true);
+							screen_redraw = true;
+							break;
+						case CONFIG_OFFSET(cpu_core_map):
+							atomic_wait(Runner::active);
+							Cpu::core_mapping = Cpu::get_core_mapping();
+							break;
 					}
 				}
-				else if (selPred.test(isInt) and Config::intValid(option, editor.text)) {
-					Config::set<int>(entry.offset, option, stoi(editor.text), true);
+				else if (selPred.test(isInt) and Config::to_int(editor.text, intValue) and Config::validate(option.offset, intValue)) {
+					Config::set<int>(option.offset, intValue, true);
 				}
 				else
 					warnings = Config::validError;
@@ -1192,8 +1232,8 @@ namespace Menu {
 		}
 		else if (is_in(key, "enter", "e", "E") and selPred.test(isEditable)) {
 			mouseEnter:
-			const auto& option = categories[selected_cat][item_height * page + selected][0];
-			editor = Draw::TextEdit{Config::getAsString(option), selPred.test(isInt)};
+			const auto& option = categories[selected_cat][item_height * page + selected];
+			editor = Draw::TextEdit{Config::getAsString(option.offset), selPred.test(isInt)};
 			editing = true;
 			mouse_mappings.clear();
 		}
@@ -1236,58 +1276,72 @@ namespace Menu {
 			page = selected = 0;
 		}
 		else if (is_in(key, "left", "right") or (vim_keys and is_in(key, "h", "l"))) {
-			const auto& option = categories[selected_cat][item_height * page + selected][0];
+			const auto& option = categories[selected_cat][item_height * page + selected];
 			if (selPred.test(isInt)) {
-				auto& entry = Config::parse_table.at(option);
-				const int mod = (option == "update_ms" ? 100 : 1);
-				long value = Config::dynamic_get<int>(config, entry.offset);
+				const int mod = (option.offset == CONFIG_OFFSET(update_ms) ? 100 : 1);
+				long value = Config::dynamic_get<int>(config, option.offset);
 				if (key == "right" or (vim_keys and key == "l")) value += mod;
 				else value -= mod;
 
-				if (Config::intValid(option, to_string(value)))
-					Config::set(entry.offset, option, static_cast<int>(value), true);
+				if (Config::validate<int>(option.offset, value))
+					Config::set(option.offset, static_cast<int>(value), true);
 				else {
 					warnings = Config::validError;
 				}
 			}
 			else if (selPred.test(isBool)) {
-				auto& entry = Config::parse_table.at(option);
-				Config::set(entry.offset, option, not Config::dynamic_get<bool>(config, entry.offset), true);
+				Config::set(option.offset, not Config::dynamic_get<bool>(config, option.offset), true);
 				screen_redraw = true;
-				if (option == "truecolor") {
-					theme_refresh = true;
-					CONFIG_SET(lowcolor, not config.lowcolor);
-				}
-				else if (option == "force_tty") {
-					theme_refresh = true;
-					CONFIG_SET(tty_mode, not config.tty_mode);
-				}
-				else if (is_in(option, "rounded_corners", "theme_background"))
-					theme_refresh = true;
-				else if (option == "background_update") {
-					Runner::pause_output = false;
-				}
-				else if (option == "base_10_sizes") {
-					recollect = true;
+				switch(option.offset) {
+					case CONFIG_OFFSET(truecolor):
+						theme_refresh = true;
+						CONFIG_SET(lowcolor, not config.lowcolor);
+						break;
+					case CONFIG_OFFSET(force_tty):
+						theme_refresh = true;
+						CONFIG_SET(tty_mode, not config.tty_mode);
+						break;
+					case CONFIG_OFFSET(rounded_corners):
+					case CONFIG_OFFSET(theme_background):
+						theme_refresh = true;
+						break;
+					case CONFIG_OFFSET(background_update):
+						Runner::pause_output = false;
+						break;
+					case CONFIG_OFFSET(base_10_sizes):
+						recollect = true;
+						break;
+
 				}
 			}
 			else if (selPred.test(isBrowseable)) {
-				auto& optList = optionsList.at(option).get();
-				auto& entry = Config::parse_table.at(option);
-				int i = v_index(optList, Config::dynamic_get<string>(config, entry.offset));
+				auto& optList = *option.browse_values;
+				int i = v_index(optList, Config::dynamic_get<string>(config, option.offset));
 
 				if ((key == "right" or (vim_keys and key == "l")) and ++i >= (int)optList.size()) i = 0;
 				else if ((key == "left" or (vim_keys and key == "h")) and --i < 0) i = optList.size() - 1;
-				Config::set(entry.offset, option, optList.at(i), true);
+				Config::set(option.offset, optList.at(i), true);
 
-				if (option == "color_theme")
-					theme_refresh = true;
-				else if (option == "log_level") {
-					Logger::set(optList.at(i));
-					Logger::info("Logger set to " + optList.at(i));
+				switch(option.offset) {
+					case CONFIG_OFFSET(color_theme):
+						theme_refresh = true;
+						break;
+					case CONFIG_OFFSET(log_level):
+						Logger::set(optList.at(i));
+						Logger::info("Logger set to " + optList.at(i));
+						break;
+					case CONFIG_OFFSET(proc_sorting):
+					case CONFIG_OFFSET(cpu_sensor):
+					case CONFIG_OFFSET(graph_symbol):
+					case CONFIG_OFFSET(graph_symbol_proc):
+					case CONFIG_OFFSET(graph_symbol_cpu):
+					case CONFIG_OFFSET(graph_symbol_mem):
+					case CONFIG_OFFSET(graph_symbol_net):
+					case CONFIG_OFFSET(cpu_graph_lower):
+					case CONFIG_OFFSET(cpu_graph_upper):
+						screen_redraw = true;
+						break;
 				}
-				else if (is_in(option, "proc_sorting", "cpu_sensor") or option.starts_with("graph_symbol") or option.starts_with("cpu_graph_"))
-					screen_redraw = true;
 			}
 			else
 				retval = NoChange;
@@ -1311,31 +1365,8 @@ namespace Menu {
 
 			//? Get variable properties for currently selected option
 			if (selPred.none() or last_sel != (selected_cat << 8) + selected) {
-				selPred.reset();
+				selPred = categories[selected_cat][item_height * page + selected].info;
 				last_sel = (selected_cat << 8) + selected;
-				const auto& selOption = categories[selected_cat][item_height * page + selected][0];
-				auto& entry = Config::parse_table.at(selOption);
-				switch(entry.type) {
-					case Config::ConfigType::INT:
-						selPred.set(isInt);
-						break;
-					case Config::ConfigType::BOOL:
-						selPred.set(isBool);
-						break;
-					case Config::ConfigType::STRING:
-						selPred.set(isString);
-						break;
-					default:
-						throw std::logic_error("Not implemented");
-				}
-
-				if (not selPred.test(isString))
-					selPred.set(is2D);
-				else if (optionsList.contains(selOption)) {
-					selPred.set(isBrowseable);
-				}
-				if (not selPred.test(isBrowseable) and (selPred.test(isString) or selPred.test(isInt)))
-					selPred.set(isEditable);
 			}
 
 			//? Category buttons
@@ -1356,13 +1387,13 @@ namespace Menu {
 			//? Option name and value
 			auto cy = y+9;
 			for (int c = 0, i = max(0, item_height * page); c++ < item_height and i < (int)categories[selected_cat].size(); i++) {
-				const auto& option = categories[selected_cat][i][0];
-				const auto& value = (option == "color_theme" ? (string) fs::path(config.color_theme).stem() : Config::getAsString(option));
+				const auto& option = categories[selected_cat][i];
+				const auto& value = (option.offset == CONFIG_OFFSET(color_theme) ? (string) fs::path(config.color_theme).stem() : Config::getAsString(option.offset));
 
 				out += Mv::to(cy++, x + 1) + (c-1 == selected ? Theme::c("selected_bg") + Theme::c("selected_fg") : Theme::c("title"))
-					+ Fx::b + cjust(capitalize(s_replace(option, "_", " "))
+					+ Fx::b + cjust(capitalize(s_replace(option.content[0], "_", " "))
 						+ (c-1 == selected and selPred.test(isBrowseable)
-							? ' ' + to_string(v_index(optionsList.at(option).get(), (option == "color_theme" ? config.color_theme : value)) + 1) + '/' + to_string(optionsList.at(option).get().size())
+							? ' ' + to_string(v_index(*option.browse_values, (option.offset == CONFIG_OFFSET(color_theme) ? config.color_theme : value)) + 1) + '/' + to_string(option.browse_values->size())
 							: ""), 29);
 				out	+= Mv::to(cy++, x + 1) + (c-1 == selected ? "" : Theme::c("main_fg")) + Fx::ub + "  "
 					+ (c-1 == selected and editing ? cjust(editor(24), 34, true) : cjust(value, 25, true)) + "  ";
@@ -1378,11 +1409,12 @@ namespace Menu {
 					}
 					//? Description of selected option
 					out += Fx::reset + Theme::c("title") + Fx::b;
-					for (int cyy = y+7; const auto& desc : categories[selected_cat][i]) {
+					for (int cyy = y+7; const auto& desc: categories[selected_cat][i].content) {
 						if (cyy++ == y+7) continue;
 						else if (cyy == y+10) out += Theme::c("main_fg") + Fx::ub;
 						else if (cyy > y + height + 4) break;
-						out += Mv::to(cyy, x+32) + desc;
+						out += Mv::to(cyy, x+32);
+						out += desc;
 					}
 				}
 			}
@@ -1429,10 +1461,11 @@ namespace Menu {
 		int retval = Changed;
 
 		if (redraw) {
-			y = max(1, Term::height/2 - 4 - (int)(help_text.size() / 2));
+
+			y = max(1, Term::height/2 - 4 - (int)(ASIZE(help_text) / 2));
 			x = Term::width/2 - 39;
-			height = min(Term::height - 6, (int)help_text.size() + 3);
-			pages = ceil((double)help_text.size() / (height - 3));
+			height = min(Term::height - 6, (int)ASIZE(help_text) + 3);
+			pages = ceil((double)ASIZE(help_text) / (height - 3));
 			page = 0;
 			bg = Draw::banner_gen(y, 0, true);
 			bg += Draw::createBox(x, y + 6, 78, height, Theme::c("hi_fg"), true, "help");
@@ -1460,7 +1493,7 @@ namespace Menu {
 			}
 			auto cy = y+7;
 			out += Mv::to(cy++, x + 1) + Theme::c("title") + Fx::b + cjust("Key:", 20) + "Description:";
-			for (int c = 0, i = max(0, (height - 3) * page); c++ < height - 3 and i < (int)help_text.size(); i++) {
+			for (int c = 0, i = max(0, (height - 3) * page); c++ < height - 3 and i < (int)ASIZE(help_text); i++) {
 				out += Mv::to(cy++, x + 1) + Theme::c("hi_fg") + Fx::b + cjust(help_text[i][0], 20)
 					+ Theme::c("main_fg") + Fx::ub + help_text[i][1];
 			}
diff --git a/src/btop_tools.cpp b/src/btop_tools.cpp
index b00b1ff62..6e343faf8 100644
--- a/src/btop_tools.cpp
+++ b/src/btop_tools.cpp
@@ -258,14 +258,6 @@ namespace Tools {
 		return str;
 	}
 
-	string s_replace(const string& str, const string& from, const string& to) {
-		string out = str;
-		for (size_t start_pos = out.find(from); start_pos != std::string::npos; start_pos = out.find(from)) {
-			out.replace(start_pos, from.length(), to);
-		}
-		return out;
-	}
-
 	string ltrim(const string& str, const string& t_str) {
 		std::string_view str_v{str};
 		while (str_v.starts_with(t_str))
diff --git a/src/btop_tools.hpp b/src/btop_tools.hpp
index f4bc36d08..8d64de43f 100644
--- a/src/btop_tools.hpp
+++ b/src/btop_tools.hpp
@@ -166,7 +166,14 @@ namespace Tools {
 	string luresize(const string str, const size_t len, bool wide = false);
 
 	//* Replace <from> in <str> with <to> and return new string
-	string s_replace(const string& str, const string& from, const string& to);
+	template<typename T>
+	string s_replace(const T& str, const std::string_view from, const std::string_view to) {
+		string out = std::string(str);
+		for (size_t start_pos = out.find(from); start_pos != std::string::npos; start_pos = out.find(from)) {
+			out.replace(start_pos, from.length(), to);
+		}
+		return out;
+	}
 
 	//* Capatilize <str>
 	inline string capitalize(string str) {
@@ -235,14 +242,17 @@ namespace Tools {
 		return std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
 	}
 
-	//* Check if a string is a valid bool value
-	inline bool isbool(const string& str) {
-		return is_in(str, "true", "false", "True", "False");
-	}
-
-	//* Convert string to bool, returning any value not equal to "true" or "True" as false
+	//* Convert string to bool, or throws if string cannot be converted
 	inline bool stobool(const string& str) {
-		return is_in(str, "true", "True");
+		if(is_in(str, "true", "True")) {
+			return true;
+		}
+
+		if(is_in(str, "false", "False")) {
+			return false;
+		}
+
+		throw std::invalid_argument("Argument cannot be convert to bool");
 	}
 
 	//* Check if a string is a valid integer value (only postive)