diff --git a/configs/general/.category b/configs/general/.category
index 6e488a0..aa489da 100755
--- a/configs/general/.category
+++ b/configs/general/.category
@@ -2,4 +2,4 @@ TITLE=General
 DESCRIPTION=Basic system settings and identification
 ICON=general
 ORDER=1
-SUBCATEGORY_ORDER=general_basic,general_mail,general_install,general_docker_install,general_terminal,general_catalogs,general_libreportal
+SUBCATEGORY_ORDER=general_basic,general_mail,general_install,general_core,general_docker_install,general_terminal,general_catalogs,general_libreportal
diff --git a/configs/general/general_core b/configs/general/general_core
new file mode 100644
index 0000000..a0f0543
--- /dev/null
+++ b/configs/general/general_core
@@ -0,0 +1,12 @@
+# ================================================================================
+# Core Components - Core LibrePortal components installed at setup time **ADVANCED**
+# @icon 🧩
+# ================================================================================
+CFG_REQUIREMENT_CONFIG=true                              # Configuration Management - Install the configuration management system. Disabling this on an existing install will brick the system. **ADVANCED** **DEV**
+CFG_REQUIREMENT_COMMAND=true                             # Command Line Tool - Install the libreportal command line tool. Disabling this on an existing install will brick the system. **ADVANCED** **DEV**
+CFG_REQUIREMENT_WEBUI=true                               # Web Interface - Install the LibrePortal WebUI. Disabling this on an existing install will brick the system. **ADVANCED** **DEV**
+CFG_REQUIREMENT_WEBUI_SERVICE=true                       # Web Task Service - Install the task-processor systemd service that backs the WebUI. Disabling this on an existing install will brick the system. **ADVANCED** **DEV**
+CFG_REQUIREMENT_DATABASE=true                            # Database Support - Install and configure database support for application data storage. Install-time choice only — flipping post-install will not retrofit. **ADVANCED** **DEV**
+CFG_REQUIREMENT_PASSWORDS=true                           # Password Management - Enable password generation and management features. Install-time choice only. **ADVANCED** **DEV**
+CFG_REQUIREMENT_DOCKER_CE=true                           # Docker CE - Install Docker Community Edition instead of the distro default. Install-time choice only — flipping post-install does not swap Docker. **ADVANCED** **DEV**
+CFG_REQUIREMENT_DOCKER_COMPOSE=true                      # Docker Compose - Install Docker Compose for multi-container application management. Install-time choice only. **ADVANCED** **DEV**
diff --git a/configs/general/general_install b/configs/general/general_install
index 9f7d591..b297557 100755
--- a/configs/general/general_install
+++ b/configs/general/general_install
@@ -11,11 +11,3 @@ CFG_GIT_USER=changeme                                    # Git Username - Git us
 CFG_GIT_KEY=changeme                                     # Git Access Key - SSH key or API key for Git repository access
 CFG_GIT_UPDATES=true                                     # Auto Check Updates - Check for updates automatically
 CFG_GIT_AUTO_UPDATES=true                                # Auto Apply Updates - Automatically apply updates when available
-CFG_REQUIREMENT_CONFIG=true                              # Configuration Management - Install the configuration management system. Disabling this on an existing install will brick the system. **ADVANCED** **DEV**
-CFG_REQUIREMENT_COMMAND=true                             # Command Line Tool - Install the libreportal command line tool. Disabling this on an existing install will brick the system. **ADVANCED** **DEV**
-CFG_REQUIREMENT_WEBUI=true                               # Web Interface - Install the LibrePortal WebUI. Disabling this on an existing install will brick the system. **ADVANCED** **DEV**
-CFG_REQUIREMENT_WEBUI_SERVICE=true                       # Web Task Service - Install the task-processor systemd service that backs the WebUI. Disabling this on an existing install will brick the system. **ADVANCED** **DEV**
-CFG_REQUIREMENT_DATABASE=true                            # Database Support - Install and configure database support for application data storage. Install-time choice only — flipping post-install will not retrofit. **ADVANCED** **DEV**
-CFG_REQUIREMENT_PASSWORDS=true                           # Password Management - Enable password generation and management features. Install-time choice only. **ADVANCED** **DEV**
-CFG_REQUIREMENT_DOCKER_CE=true                           # Docker CE - Install Docker Community Edition instead of the distro default. Install-time choice only — flipping post-install does not swap Docker. **ADVANCED** **DEV**
-CFG_REQUIREMENT_DOCKER_COMPOSE=true                      # Docker Compose - Install Docker Compose for multi-container application management. Install-time choice only. **ADVANCED** **DEV**