Improved source folder structuring

Author: TheNinth7

monkey.jungle

@@ -125,11 +125,11 @@ srcConstantsEdgeX50Button=$(srcConstantsEdgeBase);source/config/device-edge/devi
 
 # Theme definitions specify the source directories that contain
 # the color theme implementations.
-srcThemeDefinitionsBase=source/themes/theme-definitions/base
-srcThemeDefinitionsDefault=source/themes/theme-definitions/device-default
+srcThemeDefinitionsBase=source/themes/definitions/base
+srcThemeDefinitionsDefault=source/themes/definitions/device-default
 # The dark theme for night mode is based on the default theme
-srcThemeDefinitionsNightModeDark=$(srcThemeDefinitionsDefault);source/themes/theme-definitions/device-night-mode/dark
-srcThemeDefinitionsNightModeLight=source/themes/theme-definitions/device-night-mode/light
+srcThemeDefinitionsNightModeDark=$(srcThemeDefinitionsDefault);source/themes/definitions/device-night-mode/dark
+srcThemeDefinitionsNightModeLight=source/themes/definitions/device-night-mode/light
 
 # Edge devices that use buttons for control (for example 540, 840,
 # 550, 850, MTB) require a focus indicator in the menu to show
@@ -141,35 +141,35 @@ srcThemeDefinitionsNightModeLight=source/themes/theme-definitions/device-night-m
 #
 # This behavior is not available in the simulator. Therefore,
 # a blue background is used there as the menu item focus indicator.
-srcThemeDefinitionsNightModeFocusBlue=source/themes/theme-definitions/device-night-mode/focus-blue
+srcThemeDefinitionsNightModeFocusBlue=source/themes/definitions/device-night-mode/focus-blue
 
 # Edge x50 button-based devices display a rounded frame in the
 # background color for the focused menu item. The app must therefore
 # use contrasting colors for the focused entry.
 # These devices use the light theme for day mode and the dark theme
 # for night mode. For the focused menu item, the opposite theme
 # is applied to ensure proper contrast.
-srcThemeDefinitionsNightModeFocusInverted=source/themes/theme-definitions/device-night-mode/focus-inverted
+srcThemeDefinitionsNightModeFocusInverted=source/themes/definitions/device-night-mode/focus-inverted
 
 # SOURCE PATH - THEMES - THEME MANAGER
 
 # For devices that use only the dark theme.
-srcThemeManagerDefault=source/themes/theme-manager/device-default
+srcThemeManagerDefault=source/themes/manager/device-default
 
 # Devices that support night mode use the light theme by default
 # and switch to the dark theme when night mode is active.
-srcThemeManagerNightModeBase=source/themes/theme-manager/device-night-mode/base
+srcThemeManagerNightModeBase=source/themes/manager/device-night-mode/base
 
 # The default implementation switches between day and night mode
 # and does not apply a menu item focus indicator.
 # This applies to touch-based Edge devices (Explore 2, 1040, 1050).
-srcThemeManagerNightModeDefault=$(srcThemeManagerNightModeBase);source/themes/theme-manager/device-night-mode/device-default
+srcThemeManagerNightModeDefault=$(srcThemeManagerNightModeBase);source/themes/manager/device-night-mode/device-default
 
 # Button-based devices use a focus indicator.
 # The implementation for x40 and x50 devices is the same here.
 # They differ only in the source directories included for
 # the actual focus indicator theme implementations.
-srcThemeManagerNightModeFocusIndicator=$(srcThemeManagerNightModeBase);source/themes/theme-manager/device-night-mode/device-focus-indicator
+srcThemeManagerNightModeFocusIndicator=$(srcThemeManagerNightModeBase);source/themes/manager/device-night-mode/device-focus-indicator
 
 # SOURCE PATH - THEMES - ASSEMBLY