diff --git a/mirva/mirva.py b/mirva/mirva.py
index d0fedef..a9b58e7 100755
--- a/mirva/mirva.py
+++ b/mirva/mirva.py
@@ -92,13 +92,13 @@ class Mirva:
         path_list = [i["path"] for i in self.config["FOLDERS"]]
         if self.options.add_back:
             if not ".." in path_list:
-                self.config["FOLDERS"].insert(0, {"path": "..", "title": "Back", "thumb": '[guess]'})
-                config_changed = True
-
-        for d in self.folder_list:
-            if not d in path_list:
-                self.config["FOLDERS"].append({"path": d, "title": d, "thumb": '[guess]'})
+                self.config["FOLDERS"].insert(0, {"path": "..", "title": "Back", "thumb": "[guess]"})
                 config_changed = True
+        if self.options.add_folders:
+            for d in self.folder_list:
+                if not d in path_list:
+                    self.config["FOLDERS"].append({"path": d, "title": d, "thumb": "[guess]"})
+                    config_changed = True
 
         ## IMAGES
         if not "IMAGES" in self.config:
@@ -232,6 +232,12 @@ class Mirva:
             action="store_true",
             help="Add 'Back' link to parent folder.",
         )
+        parser.add_argument(
+            "--add-folders",
+            default=False,
+            action="store_true",
+            help="Add links to subfolders.",
+        )
         parser.add_argument(
             "--purge",
             default=False,
@@ -378,8 +384,7 @@ Released   : 20110306
         ).format(image=image, title=title, content=content, med_dir=self.medium_dir)
 
     def get_folder(self, path, title, thumb):
-
-        if thumb == '[guess]':
+        if thumb == "[guess]":
             try:
                 img = (
                     "style=\"background-image: url('"
@@ -389,7 +394,11 @@ Released   : 20110306
                             self.resource_dir,
                             "med",
                             sorted(
-                                [f for f in os.listdir(os.path.join(path, self.resource_dir, "med")) if f.endswith(".jpg")]
+                                [
+                                    f
+                                    for f in os.listdir(os.path.join(path, self.resource_dir, "med"))
+                                    if f.endswith(".jpg")
+                                ]
                             )[0],
                         )
                     )