diff --git a/library/config.py b/library/config.py
index 74262ea0..976fb4bc 100644
--- a/library/config.py
+++ b/library/config.py
@@ -36,6 +36,7 @@ def load_yaml(configfile):
 PATH = sys.path[0]
 CONFIG_DATA = load_yaml("config.yaml")
 THEME_DEFAULT = load_yaml("res/themes/default.yaml")
+THEME_DISK_DEFAULT = load_yaml("res/themes/default_disk.yaml")
 THEME_DATA = None
 
 
@@ -64,6 +65,10 @@ def load_theme():
 
     copy_default(THEME_DEFAULT, THEME_DATA)
 
+    if THEME_DATA['STATS']['DISK'].get("MOUNTS", False):
+        for mount in THEME_DATA['STATS']['DISK']['MOUNTS']:
+            mountpoint = [k for k, v in mount.items()][0]
+            copy_default(THEME_DISK_DEFAULT, mount[mountpoint])
 
 # Load theme on import
 load_theme()
diff --git a/library/sensors/sensors.py b/library/sensors/sensors.py
index 2c45816a..6a420faf 100644
--- a/library/sensors/sensors.py
+++ b/library/sensors/sensors.py
@@ -87,17 +87,17 @@ def virtual_free() -> int:  # In bytes
 class Disk(ABC):
     @staticmethod
     @abstractmethod
-    def disk_usage_percent() -> float:
+    def disk_usage_percent(path) -> float:
         pass
 
     @staticmethod
     @abstractmethod
-    def disk_used() -> int:  # In bytes
+    def disk_used(path) -> int:  # In bytes
         pass
 
     @staticmethod
     @abstractmethod
-    def disk_free() -> int:  # In bytes
+    def disk_free(path) -> int:  # In bytes
         pass
 
 
diff --git a/library/sensors/sensors_librehardwaremonitor.py b/library/sensors/sensors_librehardwaremonitor.py
index 5429ed8e..c1107fd1 100644
--- a/library/sensors/sensors_librehardwaremonitor.py
+++ b/library/sensors/sensors_librehardwaremonitor.py
@@ -341,16 +341,16 @@ def virtual_free() -> int:  # In bytes
 # This is because LHM is a hardware-oriented library, whereas used/free/total space is for partitions, not disks
 class Disk(sensors.Disk):
     @staticmethod
-    def disk_usage_percent() -> float:
-        return psutil.disk_usage("/").percent
+    def disk_usage_percent(path) -> float:
+        return psutil.disk_usage(path).percent
 
     @staticmethod
-    def disk_used() -> int:  # In bytes
-        return psutil.disk_usage("/").used
+    def disk_used(path) -> int:  # In bytes
+        return psutil.disk_usage(path).used
 
     @staticmethod
-    def disk_free() -> int:  # In bytes
-        return psutil.disk_usage("/").free
+    def disk_free(path) -> int:  # In bytes
+        return psutil.disk_usage(path).free
 
 
 class Net(sensors.Net):
diff --git a/library/sensors/sensors_python.py b/library/sensors/sensors_python.py
index 8f8a7192..96930dfa 100644
--- a/library/sensors/sensors_python.py
+++ b/library/sensors/sensors_python.py
@@ -255,16 +255,16 @@ def virtual_free() -> int:  # In bytes
 
 class Disk(sensors.Disk):
     @staticmethod
-    def disk_usage_percent() -> float:
-        return psutil.disk_usage("/").percent
+    def disk_usage_percent(path) -> float:
+        return psutil.disk_usage(path).percent
 
     @staticmethod
-    def disk_used() -> int:  # In bytes
-        return psutil.disk_usage("/").used
+    def disk_used(path) -> int:  # In bytes
+        return psutil.disk_usage(path).used
 
     @staticmethod
-    def disk_free() -> int:  # In bytes
-        return psutil.disk_usage("/").free
+    def disk_free(path) -> int:  # In bytes
+        return psutil.disk_usage(path).free
 
 
 class Net(sensors.Net):
diff --git a/library/sensors/sensors_stub_random.py b/library/sensors/sensors_stub_random.py
index 0dcb8f1d..31d82202 100644
--- a/library/sensors/sensors_stub_random.py
+++ b/library/sensors/sensors_stub_random.py
@@ -77,15 +77,15 @@ def virtual_free() -> int:  # In bytes
 
 class Disk(sensors.Disk):
     @staticmethod
-    def disk_usage_percent() -> float:
+    def disk_usage_percent(path) -> float:
         return random.uniform(0, 100)
 
     @staticmethod
-    def disk_used() -> int:  # In bytes
+    def disk_used(path) -> int:  # In bytes
         return random.randint(1000000000, 2000000000000)
 
     @staticmethod
-    def disk_free() -> int:  # In bytes
+    def disk_free(path) -> int:  # In bytes
         return random.randint(1000000000, 2000000000000)
 
 
diff --git a/library/sensors/sensors_stub_static.py b/library/sensors/sensors_stub_static.py
index 931338f7..c4909926 100644
--- a/library/sensors/sensors_stub_static.py
+++ b/library/sensors/sensors_stub_static.py
@@ -88,15 +88,15 @@ def virtual_free() -> int:  # In bytes
 
 class Disk(sensors.Disk):
     @staticmethod
-    def disk_usage_percent() -> float:
+    def disk_usage_percent(path) -> float:
         return PERCENTAGE_SENSOR_VALUE
 
     @staticmethod
-    def disk_used() -> int:  # In bytes
+    def disk_used(path) -> int:  # In bytes
         return int(DISK_TOTAL_SIZE_GB / 100 * PERCENTAGE_SENSOR_VALUE) * 1000000000
 
     @staticmethod
-    def disk_free() -> int:  # In bytes
+    def disk_free(path) -> int:  # In bytes
         return int(DISK_TOTAL_SIZE_GB / 100 * (100 - PERCENTAGE_SENSOR_VALUE)) * 1000000000
 
 
diff --git a/library/stats.py b/library/stats.py
index a72cf8b0..73aa83a8 100644
--- a/library/stats.py
+++ b/library/stats.py
@@ -495,110 +495,116 @@ def stats():
 class Disk:
     @staticmethod
     def stats():
-        used = sensors.Disk.disk_used()
-        free = sensors.Disk.disk_free()
-        if config.THEME_DATA['STATS']['DISK']['USED']['GRAPH'].get("SHOW", False):
-            display.lcd.DisplayProgressBar(
-                x=config.THEME_DATA['STATS']['DISK']['USED']['GRAPH'].get("X", 0),
-                y=config.THEME_DATA['STATS']['DISK']['USED']['GRAPH'].get("Y", 0),
-                width=config.THEME_DATA['STATS']['DISK']['USED']['GRAPH'].get("WIDTH", 0),
-                height=config.THEME_DATA['STATS']['DISK']['USED']['GRAPH'].get("HEIGHT", 0),
-                value=int(sensors.Disk.disk_usage_percent()),
-                min_value=config.THEME_DATA['STATS']['DISK']['USED']['GRAPH'].get("MIN_VALUE", 0),
-                max_value=config.THEME_DATA['STATS']['DISK']['USED']['GRAPH'].get("MAX_VALUE", 100),
-                bar_color=config.THEME_DATA['STATS']['DISK']['USED']['GRAPH'].get("BAR_COLOR", (0, 0, 0)),
-                bar_outline=config.THEME_DATA['STATS']['DISK']['USED']['GRAPH'].get("BAR_OUTLINE", False),
-                background_color=config.THEME_DATA['STATS']['DISK']['USED']['GRAPH'].get("BACKGROUND_COLOR",
-                                                                                         (255, 255, 255)),
-                background_image=get_full_path(config.THEME_DATA['PATH'],
-                                               config.THEME_DATA['STATS']['DISK']['USED']['GRAPH'].get(
-                                                   "BACKGROUND_IMAGE",
-                                                   None))
-            )
-
-        if config.THEME_DATA['STATS']['DISK']['USED']['TEXT'].get("SHOW", False):
-            used_text = f"{int(used / 1000000000):>5}"
-            if config.THEME_DATA['STATS']['DISK']['USED']['TEXT'].get("SHOW_UNIT", True):
-                used_text += " G"
-
-            display.lcd.DisplayText(
-                text=used_text,
-                x=config.THEME_DATA['STATS']['DISK']['USED']['TEXT'].get("X", 0),
-                y=config.THEME_DATA['STATS']['DISK']['USED']['TEXT'].get("Y", 0),
-                font=config.THEME_DATA['STATS']['DISK']['USED']['TEXT'].get("FONT",
-                                                                            "roboto-mono/RobotoMono-Regular.ttf"),
-                font_size=config.THEME_DATA['STATS']['DISK']['USED']['TEXT'].get("FONT_SIZE", 10),
-                font_color=config.THEME_DATA['STATS']['DISK']['USED']['TEXT'].get("FONT_COLOR", (0, 0, 0)),
-                background_color=config.THEME_DATA['STATS']['DISK']['USED']['TEXT'].get("BACKGROUND_COLOR",
-                                                                                        (255, 255, 255)),
-                background_image=get_full_path(config.THEME_DATA['PATH'],
-                                               config.THEME_DATA['STATS']['DISK']['USED']['TEXT'].get(
-                                                   "BACKGROUND_IMAGE",
-                                                   None))
-            )
-
-        if config.THEME_DATA['STATS']['DISK']['USED']['PERCENT_TEXT'].get("SHOW", False):
-            percent_text = f"{int(sensors.Disk.disk_usage_percent()):>3}"
-            if config.THEME_DATA['STATS']['DISK']['USED']['PERCENT_TEXT'].get("SHOW_UNIT", True):
-                percent_text += "%"
-
-            display.lcd.DisplayText(
-                text=percent_text,
-                x=config.THEME_DATA['STATS']['DISK']['USED']['PERCENT_TEXT'].get("X", 0),
-                y=config.THEME_DATA['STATS']['DISK']['USED']['PERCENT_TEXT'].get("Y", 0),
-                font=config.THEME_DATA['STATS']['DISK']['USED']['PERCENT_TEXT'].get("FONT",
-                                                                                    "roboto-mono/RobotoMono-Regular.ttf"),
-                font_size=config.THEME_DATA['STATS']['DISK']['USED']['PERCENT_TEXT'].get("FONT_SIZE", 10),
-                font_color=config.THEME_DATA['STATS']['DISK']['USED']['PERCENT_TEXT'].get("FONT_COLOR", (0, 0, 0)),
-                background_color=config.THEME_DATA['STATS']['DISK']['USED']['PERCENT_TEXT'].get("BACKGROUND_COLOR",
-                                                                                                (255, 255, 255)),
-                background_image=get_full_path(config.THEME_DATA['PATH'],
-                                               config.THEME_DATA['STATS']['DISK']['USED']['PERCENT_TEXT'].get(
-                                                   "BACKGROUND_IMAGE",
-                                                   None))
-            )
-
-        if config.THEME_DATA['STATS']['DISK']['TOTAL']['TEXT'].get("SHOW", False):
-            total_text = f"{int((free + used) / 1000000000):>5}"
-            if config.THEME_DATA['STATS']['DISK']['TOTAL']['TEXT'].get("SHOW_UNIT", True):
-                total_text += " G"
-
-            display.lcd.DisplayText(
-                text=total_text,
-                x=config.THEME_DATA['STATS']['DISK']['TOTAL']['TEXT'].get("X", 0),
-                y=config.THEME_DATA['STATS']['DISK']['TOTAL']['TEXT'].get("Y", 0),
-                font=config.THEME_DATA['STATS']['DISK']['TOTAL']['TEXT'].get("FONT",
-                                                                             "roboto-mono/RobotoMono-Regular.ttf"),
-                font_size=config.THEME_DATA['STATS']['DISK']['TOTAL']['TEXT'].get("FONT_SIZE", 10),
-                font_color=config.THEME_DATA['STATS']['DISK']['TOTAL']['TEXT'].get("FONT_COLOR", (0, 0, 0)),
-                background_color=config.THEME_DATA['STATS']['DISK']['TOTAL']['TEXT'].get("BACKGROUND_COLOR",
-                                                                                         (255, 255, 255)),
-                background_image=get_full_path(config.THEME_DATA['PATH'],
-                                               config.THEME_DATA['STATS']['DISK']['TOTAL']['TEXT'].get(
-                                                   "BACKGROUND_IMAGE",
-                                                   None))
-            )
-
-        if config.THEME_DATA['STATS']['DISK']['FREE']['TEXT'].get("SHOW", False):
-            free_text = f"{int(free / 1000000000):>5}"
-            if config.THEME_DATA['STATS']['DISK']['FREE']['TEXT'].get("SHOW_UNIT", True):
-                free_text += " G"
-
-            display.lcd.DisplayText(
-                text=free_text,
-                x=config.THEME_DATA['STATS']['DISK']['FREE']['TEXT'].get("X", 0),
-                y=config.THEME_DATA['STATS']['DISK']['FREE']['TEXT'].get("Y", 0),
-                font=config.THEME_DATA['STATS']['DISK']['FREE']['TEXT'].get("FONT",
-                                                                            "roboto-mono/RobotoMono-Regular.ttf"),
-                font_size=config.THEME_DATA['STATS']['DISK']['FREE']['TEXT'].get("FONT_SIZE", 10),
-                font_color=config.THEME_DATA['STATS']['DISK']['FREE']['TEXT'].get("FONT_COLOR", (0, 0, 0)),
-                background_color=config.THEME_DATA['STATS']['DISK']['FREE']['TEXT'].get("BACKGROUND_COLOR",
-                                                                                        (255, 255, 255)),
-                background_image=get_full_path(config.THEME_DATA['PATH'],
-                                               config.THEME_DATA['STATS']['DISK']['FREE']['TEXT'].get(
-                                                   "BACKGROUND_IMAGE",
-                                                   None))
-            )
+        if config.THEME_DATA['STATS']['DISK'].get("MOUNTS", False):
+            for mount in config.THEME_DATA['STATS']['DISK']['MOUNTS']:
+                mountpoint = [k for k, v in mount.items()][0]
+                if not os.path.exists(mountpoint):
+                    logger.warning('Invalid mount point in config: "%s"' % mountpoint)
+                else:
+                    used = sensors.Disk.disk_used(mountpoint)
+                    free = sensors.Disk.disk_free(mountpoint)
+                    if mount[mountpoint]['USED']['GRAPH'].get("SHOW", False):
+                        display.lcd.DisplayProgressBar(
+                            x=mount[mountpoint]['USED']['GRAPH'].get("X", 0),
+                            y=mount[mountpoint]['USED']['GRAPH'].get("Y", 0),
+                            width=mount[mountpoint]['USED']['GRAPH'].get("WIDTH", 0),
+                            height=mount[mountpoint]['USED']['GRAPH'].get("HEIGHT", 0),
+                            value=int(sensors.Disk.disk_usage_percent(mountpoint)),
+                            min_value=mount[mountpoint]['USED']['GRAPH'].get("MIN_VALUE", 0),
+                            max_value=mount[mountpoint]['USED']['GRAPH'].get("MAX_VALUE", 100),
+                            bar_color=mount[mountpoint]['USED']['GRAPH'].get("BAR_COLOR", (0, 0, 0)),
+                            bar_outline=mount[mountpoint]['USED']['GRAPH'].get("BAR_OUTLINE", False),
+                            background_color=mount[mountpoint]['USED']['GRAPH'].get("BACKGROUND_COLOR",
+                                                                                                     (255, 255, 255)),
+                            background_image=get_full_path(config.THEME_DATA['PATH'],
+                                                           mount[mountpoint]['USED']['GRAPH'].get(
+                                                               "BACKGROUND_IMAGE",
+                                                               None))
+                        )
+
+                    if mount[mountpoint]['USED']['TEXT'].get("SHOW", False):
+                        used_text = f"{int(used / 1000000000):>5}"
+                        if mount[mountpoint]['USED']['TEXT'].get("SHOW_UNIT", True):
+                            used_text += " G"
+
+                        display.lcd.DisplayText(
+                            text=used_text,
+                            x=mount[mountpoint]['USED']['TEXT'].get("X", 0),
+                            y=mount[mountpoint]['USED']['TEXT'].get("Y", 0),
+                            font=mount[mountpoint]['USED']['TEXT'].get("FONT",
+                                                                                        "roboto-mono/RobotoMono-Regular.ttf"),
+                            font_size=mount[mountpoint]['USED']['TEXT'].get("FONT_SIZE", 10),
+                            font_color=mount[mountpoint]['USED']['TEXT'].get("FONT_COLOR", (0, 0, 0)),
+                            background_color=mount[mountpoint]['USED']['TEXT'].get("BACKGROUND_COLOR",
+                                                                                                    (255, 255, 255)),
+                            background_image=get_full_path(config.THEME_DATA['PATH'],
+                                                           mount[mountpoint]['USED']['TEXT'].get(
+                                                               "BACKGROUND_IMAGE",
+                                                               None))
+                        )
+
+                    if mount[mountpoint]['USED']['PERCENT_TEXT'].get("SHOW", False):
+                        percent_text = f"{int(sensors.Disk.disk_usage_percent(mountpoint)):>3}"
+                        if mount[mountpoint]['USED']['PERCENT_TEXT'].get("SHOW_UNIT", True):
+                            percent_text += "%"
+
+                        display.lcd.DisplayText(
+                            text=percent_text,
+                            x=mount[mountpoint]['USED']['PERCENT_TEXT'].get("X", 0),
+                            y=mount[mountpoint]['USED']['PERCENT_TEXT'].get("Y", 0),
+                            font=mount[mountpoint]['USED']['PERCENT_TEXT'].get("FONT",
+                                                                                                "roboto-mono/RobotoMono-Regular.ttf"),
+                            font_size=mount[mountpoint]['USED']['PERCENT_TEXT'].get("FONT_SIZE", 10),
+                            font_color=mount[mountpoint]['USED']['PERCENT_TEXT'].get("FONT_COLOR", (0, 0, 0)),
+                            background_color=mount[mountpoint]['USED']['PERCENT_TEXT'].get("BACKGROUND_COLOR",
+                                                                                                            (255, 255, 255)),
+                            background_image=get_full_path(config.THEME_DATA['PATH'],
+                                                           mount[mountpoint]['USED']['PERCENT_TEXT'].get(
+                                                               "BACKGROUND_IMAGE",
+                                                               None))
+                        )
+
+                    if mount[mountpoint]['TOTAL']['TEXT'].get("SHOW", False):
+                        total_text = f"{int((free + used) / 1000000000):>5}"
+                        if mount[mountpoint]['TOTAL']['TEXT'].get("SHOW_UNIT", True):
+                            total_text += " G"
+
+                        display.lcd.DisplayText(
+                            text=total_text,
+                            x=mount[mountpoint]['TOTAL']['TEXT'].get("X", 0),
+                            y=mount[mountpoint]['TOTAL']['TEXT'].get("Y", 0),
+                            font=mount[mountpoint]['TOTAL']['TEXT'].get("FONT",
+                                                                                         "roboto-mono/RobotoMono-Regular.ttf"),
+                            font_size=mount[mountpoint]['TOTAL']['TEXT'].get("FONT_SIZE", 10),
+                            font_color=mount[mountpoint]['TOTAL']['TEXT'].get("FONT_COLOR", (0, 0, 0)),
+                            background_color=mount[mountpoint]['TOTAL']['TEXT'].get("BACKGROUND_COLOR",
+                                                                                                     (255, 255, 255)),
+                            background_image=get_full_path(config.THEME_DATA['PATH'],
+                                                           mount[mountpoint]['TOTAL']['TEXT'].get(
+                                                               "BACKGROUND_IMAGE",
+                                                               None))
+                        )
+
+                    if mount[mountpoint]['FREE']['TEXT'].get("SHOW", False):
+                        free_text = f"{int(free / 1000000000):>5}"
+                        if mount[mountpoint]['FREE']['TEXT'].get("SHOW_UNIT", True):
+                            free_text += " G"
+
+                        display.lcd.DisplayText(
+                            text=free_text,
+                            x=mount[mountpoint]['FREE']['TEXT'].get("X", 0),
+                            y=mount[mountpoint]['FREE']['TEXT'].get("Y", 0),
+                            font=mount[mountpoint]['FREE']['TEXT'].get("FONT",
+                                                                                        "roboto-mono/RobotoMono-Regular.ttf"),
+                            font_size=mount[mountpoint]['FREE']['TEXT'].get("FONT_SIZE", 10),
+                            font_color=mount[mountpoint]['FREE']['TEXT'].get("FONT_COLOR", (0, 0, 0)),
+                            background_color=mount[mountpoint]['FREE']['TEXT'].get("BACKGROUND_COLOR",
+                                                                                                    (255, 255, 255)),
+                            background_image=get_full_path(config.THEME_DATA['PATH'],
+                                                           mount[mountpoint]['FREE']['TEXT'].get(
+                                                               "BACKGROUND_IMAGE",
+                                                               None))
+                        )
 
 
 class Net:
diff --git a/res/themes/3.5inchTheme2/theme.yaml b/res/themes/3.5inchTheme2/theme.yaml
index a16da81c..c34364d8 100644
--- a/res/themes/3.5inchTheme2/theme.yaml
+++ b/res/themes/3.5inchTheme2/theme.yaml
@@ -158,47 +158,49 @@ STATS:
         BACKGROUND_COLOR: 132, 154, 165
   DISK:
     INTERVAL: 10
-    USED:
-      GRAPH:
-        SHOW: True
-        X: 155
-        Y: 345
-        WIDTH: 150
-        HEIGHT: 15
-        MIN_VALUE: 0
-        MAX_VALUE: 100
-        BAR_COLOR: 0, 0, 255
-        BAR_OUTLINE: False
-        BACKGROUND_COLOR: 0, 0, 0
-      TEXT:
-        SHOW: TRUE
-        SHOW_UNIT: True
-        X: 204
-        Y: 411
-        FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
-        FONT_SIZE: 23
-        FONT_COLOR: 255, 255, 255
-        BACKGROUND_COLOR: 132, 154, 165
-    TOTAL:
-      TEXT:
-        SHOW: TRUE
-        SHOW_UNIT: True
-        X: 204
-        Y: 381
-        FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
-        FONT_SIZE: 23
-        FONT_COLOR: 255, 255, 255
-        BACKGROUND_COLOR: 132, 154, 165
-    FREE:
-      TEXT:
-        SHOW: TRUE
-        SHOW_UNIT: True
-        X: 204
-        Y: 441
-        FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
-        FONT_SIZE: 23
-        FONT_COLOR: 255, 255, 255
-        BACKGROUND_COLOR: 132, 154, 165
+    MOUNTS:
+      - "/":
+          USED:
+            GRAPH:
+              SHOW: True
+              X: 155
+              Y: 345
+              WIDTH: 150
+              HEIGHT: 15
+              MIN_VALUE: 0
+              MAX_VALUE: 100
+              BAR_COLOR: 0, 0, 255
+              BAR_OUTLINE: False
+              BACKGROUND_COLOR: 0, 0, 0
+            TEXT:
+              SHOW: TRUE
+              SHOW_UNIT: True
+              X: 204
+              Y: 411
+              FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
+              FONT_SIZE: 23
+              FONT_COLOR: 255, 255, 255
+              BACKGROUND_COLOR: 132, 154, 165
+          TOTAL:
+            TEXT:
+              SHOW: TRUE
+              SHOW_UNIT: True
+              X: 204
+              Y: 381
+              FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
+              FONT_SIZE: 23
+              FONT_COLOR: 255, 255, 255
+              BACKGROUND_COLOR: 132, 154, 165
+          FREE:
+            TEXT:
+              SHOW: TRUE
+              SHOW_UNIT: True
+              X: 204
+              Y: 441
+              FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
+              FONT_SIZE: 23
+              FONT_COLOR: 255, 255, 255
+              BACKGROUND_COLOR: 132, 154, 165
 
   DATE:
     INTERVAL: 1
diff --git a/res/themes/Cyberpunk-net/theme.yaml b/res/themes/Cyberpunk-net/theme.yaml
index 5f60b31e..b285b6e5 100644
--- a/res/themes/Cyberpunk-net/theme.yaml
+++ b/res/themes/Cyberpunk-net/theme.yaml
@@ -191,16 +191,18 @@ STATS:
         BACKGROUND_IMAGE: background.png
   DISK:
     INTERVAL: 10
-    USED:
-      PERCENT_TEXT:
-        SHOW: True
-        SHOW_UNIT: True
-        X: 170
-        Y: 430
-        FONT: generale-mono/GeneraleMonoA.ttf
-        FONT_SIZE: 30
-        FONT_COLOR: 2, 216, 243
-        BACKGROUND_IMAGE: background.png
+    MOUNTS:
+      - "/":
+          USED:
+            PERCENT_TEXT:
+              SHOW: True
+              SHOW_UNIT: True
+              X: 170
+              Y: 430
+              FONT: generale-mono/GeneraleMonoA.ttf
+              FONT_SIZE: 30
+              FONT_COLOR: 2, 216, 243
+              BACKGROUND_IMAGE: background.png
   NET:
     INTERVAL: 1
     ETH:
diff --git a/res/themes/Cyberpunk/theme.yaml b/res/themes/Cyberpunk/theme.yaml
index faf63e91..225cad04 100644
--- a/res/themes/Cyberpunk/theme.yaml
+++ b/res/themes/Cyberpunk/theme.yaml
@@ -183,35 +183,37 @@ STATS:
         BACKGROUND_IMAGE: background.png
   DISK:
     INTERVAL: 10
-    USED:
-      TEXT:
-        SHOW: True
-        SHOW_UNIT: True
-        X: 155
-        Y: 338
-        FONT: generale-mono/GeneraleMonoA.ttf
-        FONT_SIZE: 26
-        FONT_COLOR: 2, 216, 243
-        BACKGROUND_IMAGE: background.png
-      PERCENT_TEXT:
-        SHOW: True
-        SHOW_UNIT: True
-        X: 170
-        Y: 430
-        FONT: generale-mono/GeneraleMonoA.ttf
-        FONT_SIZE: 30
-        FONT_COLOR: 2, 216, 243
-        BACKGROUND_IMAGE: background.png
-    FREE:
-      TEXT:
-        SHOW: True
-        SHOW_UNIT: True
-        X: 155
-        Y: 383
-        FONT: generale-mono/GeneraleMonoA.ttf
-        FONT_SIZE: 26
-        FONT_COLOR: 2, 216, 243
-        BACKGROUND_IMAGE: background.png
+    MOUNTS:
+      - "/":
+          USED:
+            TEXT:
+              SHOW: True
+              SHOW_UNIT: True
+              X: 155
+              Y: 338
+              FONT: generale-mono/GeneraleMonoA.ttf
+              FONT_SIZE: 26
+              FONT_COLOR: 2, 216, 243
+              BACKGROUND_IMAGE: background.png
+            PERCENT_TEXT:
+              SHOW: True
+              SHOW_UNIT: True
+              X: 170
+              Y: 430
+              FONT: generale-mono/GeneraleMonoA.ttf
+              FONT_SIZE: 30
+              FONT_COLOR: 2, 216, 243
+              BACKGROUND_IMAGE: background.png
+          FREE:
+            TEXT:
+              SHOW: True
+              SHOW_UNIT: True
+              X: 155
+              Y: 383
+              FONT: generale-mono/GeneraleMonoA.ttf
+              FONT_SIZE: 26
+              FONT_COLOR: 2, 216, 243
+              BACKGROUND_IMAGE: background.png
   DATE:
     INTERVAL: 1
     DAY:
diff --git a/res/themes/LandscapeMagicBlue/theme.yaml b/res/themes/LandscapeMagicBlue/theme.yaml
index c9e131b5..c43762a1 100644
--- a/res/themes/LandscapeMagicBlue/theme.yaml
+++ b/res/themes/LandscapeMagicBlue/theme.yaml
@@ -147,27 +147,29 @@ STATS:
         BACKGROUND_IMAGE: background.png
   DISK:
     INTERVAL: 10
-    USED:
-      GRAPH:
-        SHOW: True
-        X: 352
-        Y: 93
-        WIDTH: 110
-        HEIGHT: 7
-        MIN_VALUE: 0
-        MAX_VALUE: 100
-        BAR_COLOR: 82, 255, 255
-        BAR_OUTLINE: False
-        BACKGROUND_IMAGE: background.png
-      TEXT:
-        SHOW: True
-        SHOW_UNIT: True
-        X: 390
-        Y: 65
-        FONT: generale-mono/GeneraleMonoA.ttf
-        FONT_SIZE: 16
-        FONT_COLOR: 128, 255, 255
-        BACKGROUND_IMAGE: background.png
+    MOUNTS:
+      - "/":
+          USED:
+            GRAPH:
+              SHOW: True
+              X: 352
+              Y: 93
+              WIDTH: 110
+              HEIGHT: 7
+              MIN_VALUE: 0
+              MAX_VALUE: 100
+              BAR_COLOR: 82, 255, 255
+              BAR_OUTLINE: False
+              BACKGROUND_IMAGE: background.png
+            TEXT:
+              SHOW: True
+              SHOW_UNIT: True
+              X: 390
+              Y: 65
+              FONT: generale-mono/GeneraleMonoA.ttf
+              FONT_SIZE: 16
+              FONT_COLOR: 128, 255, 255
+              BACKGROUND_IMAGE: background.png
   NET:
     INTERVAL: 1
     ETH:
diff --git a/res/themes/Terminal/theme.yaml b/res/themes/Terminal/theme.yaml
index a3de964c..499fa7e8 100644
--- a/res/themes/Terminal/theme.yaml
+++ b/res/themes/Terminal/theme.yaml
@@ -141,18 +141,20 @@ STATS:
         BACKGROUND_COLOR: 0, 0, 0
   DISK:
     INTERVAL: 10
-    USED:
-      GRAPH:
-        SHOW: True
-        X: 115
-        Y: 357
-        WIDTH: 178
-        HEIGHT: 13
-        MIN_VALUE: 0
-        MAX_VALUE: 100
-        BAR_COLOR: 255, 0, 0
-        BAR_OUTLINE: False
-        BACKGROUND_COLOR: 0, 0, 0
+    MOUNTS:
+      - "/":
+          USED:
+            GRAPH:
+              SHOW: True
+              X: 115
+              Y: 357
+              WIDTH: 178
+              HEIGHT: 13
+              MIN_VALUE: 0
+              MAX_VALUE: 100
+              BAR_COLOR: 255, 0, 0
+              BAR_OUTLINE: False
+              BACKGROUND_COLOR: 0, 0, 0
   DATE:
     INTERVAL: 1
     DAY:
diff --git a/res/themes/bash-dark-green-gpu/theme.yaml b/res/themes/bash-dark-green-gpu/theme.yaml
index c703c05b..37f45c0d 100644
--- a/res/themes/bash-dark-green-gpu/theme.yaml
+++ b/res/themes/bash-dark-green-gpu/theme.yaml
@@ -154,56 +154,58 @@ STATS:
         BACKGROUND_IMAGE: background.png
   DISK:
     INTERVAL: 10
-    USED:
-      GRAPH:
-        SHOW: True
-        X: 33
-        Y: 455
-        WIDTH: 98
-        HEIGHT: 13
-        MIN_VALUE: 0
-        MAX_VALUE: 100
-        BAR_COLOR: 53, 191, 92
-        BAR_OUTLINE: False
-        BACKGROUND_COLOR: 0, 0, 0
-      TEXT:
-        SHOW: True
-        SHOW_UNIT: True
-        X: 144
-        Y: 418
-        FONT: roboto-mono/RobotoMono-Regular.ttf
-        FONT_SIZE: 12
-        FONT_COLOR: 53, 191, 92
-        BACKGROUND_IMAGE: background.png
-      PERCENT_TEXT:
-        SHOW: True
-        SHOW_UNIT: True
-        X: 46
-        Y: 410
-        FONT: roboto-mono/RobotoMono-Regular.ttf
-        FONT_SIZE: 22
-        FONT_COLOR: 53, 191, 92
-        BACKGROUND_IMAGE: background.png
-    TOTAL:
-      TEXT:
-        SHOW: True
-        SHOW_UNIT: True
-        X: 229
-        Y: 418
-        FONT: roboto-mono/RobotoMono-Regular.ttf
-        FONT_SIZE: 12
-        FONT_COLOR: 53, 191, 92
-        BACKGROUND_IMAGE: background.png
-    FREE:
-      TEXT:
-        SHOW: True
-        SHOW_UNIT: True
-        X: 144
-        Y: 459
-        FONT: roboto-mono/RobotoMono-Regular.ttf
-        FONT_SIZE: 12
-        FONT_COLOR: 53, 191, 92
-        BACKGROUND_IMAGE: background.png
+    MOUNTS:
+      - "/":
+          USED:
+            GRAPH:
+              SHOW: True
+              X: 33
+              Y: 455
+              WIDTH: 98
+              HEIGHT: 13
+              MIN_VALUE: 0
+              MAX_VALUE: 100
+              BAR_COLOR: 53, 191, 92
+              BAR_OUTLINE: False
+              BACKGROUND_COLOR: 0, 0, 0
+            TEXT:
+              SHOW: True
+              SHOW_UNIT: True
+              X: 144
+              Y: 418
+              FONT: roboto-mono/RobotoMono-Regular.ttf
+              FONT_SIZE: 12
+              FONT_COLOR: 53, 191, 92
+              BACKGROUND_IMAGE: background.png
+            PERCENT_TEXT:
+              SHOW: True
+              SHOW_UNIT: True
+              X: 46
+              Y: 410
+              FONT: roboto-mono/RobotoMono-Regular.ttf
+              FONT_SIZE: 22
+              FONT_COLOR: 53, 191, 92
+              BACKGROUND_IMAGE: background.png
+          TOTAL:
+            TEXT:
+              SHOW: True
+              SHOW_UNIT: True
+              X: 229
+              Y: 418
+              FONT: roboto-mono/RobotoMono-Regular.ttf
+              FONT_SIZE: 12
+              FONT_COLOR: 53, 191, 92
+              BACKGROUND_IMAGE: background.png
+          FREE:
+            TEXT:
+              SHOW: True
+              SHOW_UNIT: True
+              X: 144
+              Y: 459
+              FONT: roboto-mono/RobotoMono-Regular.ttf
+              FONT_SIZE: 12
+              FONT_COLOR: 53, 191, 92
+              BACKGROUND_IMAGE: background.png
   NET:
     INTERVAL: 1
     WLO:
diff --git a/res/themes/bash-dark-green/theme.yaml b/res/themes/bash-dark-green/theme.yaml
index 9822ba80..b5413c15 100644
--- a/res/themes/bash-dark-green/theme.yaml
+++ b/res/themes/bash-dark-green/theme.yaml
@@ -100,56 +100,58 @@ STATS:
         BACKGROUND_IMAGE: background.png
   DISK:
     INTERVAL: 10
-    USED:
-      GRAPH:
-        SHOW: True
-        X: 33
-        Y: 455
-        WIDTH: 98
-        HEIGHT: 13
-        MIN_VALUE: 0
-        MAX_VALUE: 100
-        BAR_COLOR: 53, 191, 92
-        BAR_OUTLINE: False
-        BACKGROUND_COLOR: 0, 0, 0
-      TEXT:
-        SHOW: True
-        SHOW_UNIT: True
-        X: 124
-        Y: 394
-        FONT: roboto-mono/RobotoMono-Regular.ttf
-        FONT_SIZE: 14
-        FONT_COLOR: 53, 191, 92
-        BACKGROUND_IMAGE: background.png
-      PERCENT_TEXT:
-        SHOW: True
-        SHOW_UNIT: True
-        X: 46
-        Y: 409
-        FONT: roboto-mono/RobotoMono-Regular.ttf
-        FONT_SIZE: 22
-        FONT_COLOR: 53, 191, 92
-        BACKGROUND_IMAGE: background.png
-    TOTAL:
-      TEXT:
-        SHOW: True
-        SHOW_UNIT: True
-        X: 227
-        Y: 394
-        FONT: roboto-mono/RobotoMono-Regular.ttf
-        FONT_SIZE: 14
-        FONT_COLOR: 53, 191, 92
-        BACKGROUND_IMAGE: background.png
-    FREE:
-      TEXT:
-        SHOW: True
-        SHOW_UNIT: True
-        X: 124
-        Y: 443
-        FONT: roboto-mono/RobotoMono-Regular.ttf
-        FONT_SIZE: 14
-        FONT_COLOR: 53, 191, 92
-        BACKGROUND_IMAGE: background.png
+    MOUNTS:
+      - "/":
+          USED:
+            GRAPH:
+              SHOW: True
+              X: 33
+              Y: 455
+              WIDTH: 98
+              HEIGHT: 13
+              MIN_VALUE: 0
+              MAX_VALUE: 100
+              BAR_COLOR: 53, 191, 92
+              BAR_OUTLINE: False
+              BACKGROUND_COLOR: 0, 0, 0
+            TEXT:
+              SHOW: True
+              SHOW_UNIT: True
+              X: 124
+              Y: 394
+              FONT: roboto-mono/RobotoMono-Regular.ttf
+              FONT_SIZE: 14
+              FONT_COLOR: 53, 191, 92
+              BACKGROUND_IMAGE: background.png
+            PERCENT_TEXT:
+              SHOW: True
+              SHOW_UNIT: True
+              X: 46
+              Y: 409
+              FONT: roboto-mono/RobotoMono-Regular.ttf
+              FONT_SIZE: 22
+              FONT_COLOR: 53, 191, 92
+              BACKGROUND_IMAGE: background.png
+          TOTAL:
+            TEXT:
+              SHOW: True
+              SHOW_UNIT: True
+              X: 227
+              Y: 394
+              FONT: roboto-mono/RobotoMono-Regular.ttf
+              FONT_SIZE: 14
+              FONT_COLOR: 53, 191, 92
+              BACKGROUND_IMAGE: background.png
+          FREE:
+            TEXT:
+              SHOW: True
+              SHOW_UNIT: True
+              X: 124
+              Y: 443
+              FONT: roboto-mono/RobotoMono-Regular.ttf
+              FONT_SIZE: 14
+              FONT_COLOR: 53, 191, 92
+              BACKGROUND_IMAGE: background.png
   NET:
     INTERVAL: 1
     WLO:
diff --git a/res/themes/default.yaml b/res/themes/default.yaml
index 3e31fdf5..00703e73 100644
--- a/res/themes/default.yaml
+++ b/res/themes/default.yaml
@@ -63,23 +63,6 @@ STATS:
         SHOW_UNIT: False
   DISK:
     INTERVAL: 10
-    USED:
-      GRAPH:
-        SHOW: False
-      TEXT:
-        SHOW: False
-        SHOW_UNIT: False
-      PERCENT_TEXT:
-        SHOW: False
-        SHOW_UNIT: False
-    TOTAL:
-      TEXT:
-        SHOW: False
-        SHOW_UNIT: False
-    FREE:
-      TEXT:
-        SHOW: False
-        SHOW_UNIT: False
   NET:
     INTERVAL: 1
     WLO:
diff --git a/res/themes/default_disk.yaml b/res/themes/default_disk.yaml
new file mode 100644
index 00000000..4f79b0f5
--- /dev/null
+++ b/res/themes/default_disk.yaml
@@ -0,0 +1,19 @@
+# This file is used to add mandatory sections to a theme file in case they are missing
+# This is not a theme! Do not use this file to create a new theme, as a lot of content is missing: use theme_example.yaml
+USED:
+  GRAPH:
+    SHOW: False
+  TEXT:
+    SHOW: False
+    SHOW_UNIT: False
+  PERCENT_TEXT:
+    SHOW: False
+    SHOW_UNIT: False
+TOTAL:
+  TEXT:
+    SHOW: False
+    SHOW_UNIT: False
+FREE:
+  TEXT:
+    SHOW: False
+    SHOW_UNIT: False
diff --git a/res/themes/theme_example.yaml b/res/themes/theme_example.yaml
index 0b525dc2..31f003ba 100644
--- a/res/themes/theme_example.yaml
+++ b/res/themes/theme_example.yaml
@@ -268,61 +268,63 @@ STATS:
         BACKGROUND_IMAGE: background.png
   DISK:
     INTERVAL: 10
-    USED:
-      GRAPH:
-        SHOW: False
-        X: 115
-        Y: 357
-        WIDTH: 178
-        HEIGHT: 13
-        MIN_VALUE: 0
-        MAX_VALUE: 100
-        BAR_COLOR: 255, 0, 0
-        BAR_OUTLINE: False
-        # BACKGROUND_COLOR: 0, 0, 0
-        BACKGROUND_IMAGE: background.png
-      TEXT:
-        SHOW: False
-        SHOW_UNIT: True
-        X: 204
-        Y: 405
-        FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
-        FONT_SIZE: 23
-        FONT_COLOR: 255, 255, 255
-        # BACKGROUND_COLOR: 132, 154, 165
-        BACKGROUND_IMAGE: background.png
-      PERCENT_TEXT:
-        SHOW: False
-        SHOW_UNIT: True
-        X: 46
-        Y: 402
-        FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
-        FONT_SIZE: 23
-        FONT_COLOR: 255, 255, 255
-        # BACKGROUND_COLOR: 132, 154, 165
-        BACKGROUND_IMAGE: background.png
-    TOTAL:
-      TEXT:
-        SHOW: False
-        SHOW_UNIT: True
-        X: 204
-        Y: 375
-        FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
-        FONT_SIZE: 23
-        FONT_COLOR: 255, 255, 255
-        # BACKGROUND_COLOR: 132, 154, 165
-        BACKGROUND_IMAGE: background.png
-    FREE:
-      TEXT:
-        SHOW: False
-        SHOW_UNIT: True
-        X: 204
-        Y: 435
-        FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
-        FONT_SIZE: 23
-        FONT_COLOR: 255, 255, 255
-        # BACKGROUND_COLOR: 132, 154, 165
-        BACKGROUND_IMAGE: background.png
+    MOUNTS:
+      - "/":
+          USED:
+            GRAPH:
+              SHOW: False
+              X: 115
+              Y: 357
+              WIDTH: 178
+              HEIGHT: 13
+              MIN_VALUE: 0
+              MAX_VALUE: 100
+              BAR_COLOR: 255, 0, 0
+              BAR_OUTLINE: False
+              # BACKGROUND_COLOR: 0, 0, 0
+              BACKGROUND_IMAGE: background.png
+            TEXT:
+              SHOW: False
+              SHOW_UNIT: True
+              X: 204
+              Y: 405
+              FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
+              FONT_SIZE: 23
+              FONT_COLOR: 255, 255, 255
+              # BACKGROUND_COLOR: 132, 154, 165
+              BACKGROUND_IMAGE: background.png
+            PERCENT_TEXT:
+              SHOW: False
+              SHOW_UNIT: True
+              X: 46
+              Y: 402
+              FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
+              FONT_SIZE: 23
+              FONT_COLOR: 255, 255, 255
+              # BACKGROUND_COLOR: 132, 154, 165
+              BACKGROUND_IMAGE: background.png
+          TOTAL:
+            TEXT:
+              SHOW: False
+              SHOW_UNIT: True
+              X: 204
+              Y: 375
+              FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
+              FONT_SIZE: 23
+              FONT_COLOR: 255, 255, 255
+              # BACKGROUND_COLOR: 132, 154, 165
+              BACKGROUND_IMAGE: background.png
+          FREE:
+            TEXT:
+              SHOW: False
+              SHOW_UNIT: True
+              X: 204
+              Y: 435
+              FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
+              FONT_SIZE: 23
+              FONT_COLOR: 255, 255, 255
+              # BACKGROUND_COLOR: 132, 154, 165
+              BACKGROUND_IMAGE: background.png
   NET:
     INTERVAL: 1
     WLO: