diff --git a/OrchidCore/src/main/java/com/eden/orchid/api/OrchidContextImpl.java b/OrchidCore/src/main/java/com/eden/orchid/api/OrchidContextImpl.java
index 2ed6866598..6140668776 100644
--- a/OrchidCore/src/main/java/com/eden/orchid/api/OrchidContextImpl.java
+++ b/OrchidCore/src/main/java/com/eden/orchid/api/OrchidContextImpl.java
@@ -119,12 +119,7 @@ public Collection<OrchidService> getServices() {
     @Override
     public void extractServiceOptions() {
         services.values().forEach(service -> {
-            JSONElement el = query(service.optionsQuery());
-            if (EdenUtils.elementIsObject(el)) {
-                service.extractOptions(this, ((JSONObject) el.getElement()).toMap());
-            } else {
-                service.extractOptions(this, new HashMap<>());
-            }
+            service.extractOptions(this, new HashMap<>());
         });
     }
 
diff --git a/OrchidCore/src/main/java/com/eden/orchid/api/OrchidService.java b/OrchidCore/src/main/java/com/eden/orchid/api/OrchidService.java
index a10f9d2b24..3e08c106a7 100644
--- a/OrchidCore/src/main/java/com/eden/orchid/api/OrchidService.java
+++ b/OrchidCore/src/main/java/com/eden/orchid/api/OrchidService.java
@@ -4,24 +4,9 @@
 import com.eden.orchid.api.options.annotations.Description;
 import com.eden.orchid.utilities.SuppressedWarnings;
 
-@Description(value = "The core, common API for working with Orchid..", name = "Services")
+@Description(value = "The core, common API for working with Orchid.", name = "Services")
 public interface OrchidService extends OptionsHolder {
 
-    default String getKey() {
-        String key = getClass().getSimpleName();
-        key = key.replaceAll("Service", "");
-        key = key.replaceAll("Impl", "");
-        key = key.substring(0, 1).toLowerCase() + key.substring(1);
-        if(!key.endsWith("s")) {
-            key = key + "s";
-        }
-        return key;
-    }
-
-    default String optionsQuery() {
-        return "services." + getKey();
-    }
-
     void initialize(OrchidContext context);
 
     default void onStart() { }
diff --git a/OrchidCore/src/main/java/com/eden/orchid/api/compilers/CompilerServiceImpl.java b/OrchidCore/src/main/java/com/eden/orchid/api/compilers/CompilerServiceImpl.java
index 0f99b20837..762f3f4b82 100644
--- a/OrchidCore/src/main/java/com/eden/orchid/api/compilers/CompilerServiceImpl.java
+++ b/OrchidCore/src/main/java/com/eden/orchid/api/compilers/CompilerServiceImpl.java
@@ -4,9 +4,11 @@
 import com.eden.common.util.EdenUtils;
 import com.eden.orchid.api.OrchidContext;
 import com.eden.orchid.api.options.annotations.AllOptions;
+import com.eden.orchid.api.options.annotations.Archetype;
 import com.eden.orchid.api.options.annotations.Description;
 import com.eden.orchid.api.options.annotations.Option;
 import com.eden.orchid.api.options.annotations.StringDefault;
+import com.eden.orchid.api.options.archetypes.ConfigArchetype;
 import kotlin.Lazy;
 import kotlin.LazyKt;
 import org.json.JSONObject;
@@ -22,31 +24,52 @@
 import java.util.TreeSet;
 
 /**
- * @since v1.0.0
  * @orchidApi services
+ * @since v1.0.0
  */
 @Singleton
 @Description(value = "How content gets processed by Orchid.", name = "Compilers")
+@Archetype(value = ConfigArchetype.class, key = "services.compilers")
 public final class CompilerServiceImpl implements CompilerService {
-    private String[] binaryExtensions = new String[] {"jpg", "jpeg", "png", "pdf", "gif", "svg", "ico", 
-    // Webfont Formats
-    "otf", "eot", "ttf", "woff", "woff2"};
+
+    private String[] binaryExtensions = new String[]{
+            "jpg",
+            "jpeg",
+            "png",
+            "pdf",
+            "gif",
+            "svg",
+            "ico",
+            // Webfont Formats
+            "otf",
+            "eot",
+            "ttf",
+            "woff",
+            "woff2"
+    };
+
     @Option("binaryExtensions")
     @Description("Add additional file extensions to recognize as binary, so these assets can be copied directly without further processing.")
     public String[] customBinaryExtensions;
+
     @Option("compilerExtensions")
     @Description("Convert unrecognized file extensions into known file types for the compilers. The should be a mapping with keys of the unrecognized extension and values of the known extension. These take precedence over the normally recognized extensions.")
     public JSONObject customCompilerExtensions;
-    private String[] ignoredOutputExtensions = new String[] {"min", "index"};
+
+    private String[] ignoredOutputExtensions = new String[]{"min", "index"};
+
     @Option("ignoredOutputExtensions")
     @Description("Add additional file extensions to exclude from counting as an \'output extension\' An example would be \'min\' in a filename like \'index.min.js\', which is commonly used to denote a minified asset and is not intended to make a file named \'index.min\'.")
     public String[] customIgnoredOutputExtensions;
+
     @Option
     @StringDefault("peb")
     @Description("Convert unrecognized file extensions into known file types for the compilers. The should be a mapping with keys of the unrecognized extension and values of the known extension. These take precedence over the normally recognized extensions.")
     public String defaultPrecompilerExtension;
+
     @AllOptions
     public Map<String, Object> allConfig;
+
     private OrchidContext context;
     private Set<String> compilerExtensions;
     private Set<String> parserExtensions;
@@ -72,11 +95,9 @@ public void initialize(OrchidContext context) {
     @Override
     public void onPostExtraction() {
         buildCustomCompilerIndex();
-        if (allConfig.get("precompiler") instanceof Map) {
-            precompiler.getValue().extractOptions(context, (HashMap<String, Object>) allConfig.get("precompiler"));
-        } else {
-            precompiler.getValue().extractOptions(context, new HashMap<>());
-        }
+        precompiler.getValue().extractOptions(context, new HashMap<>());
+        compilers.getValue().forEach(it -> it.extractOptions(context, new HashMap<>()));
+        parsers.getValue().forEach(it -> it.extractOptions(context, new HashMap<>()));
     }
 
     private void buildCompilerIndex() {
diff --git a/OrchidCore/src/main/java/com/eden/orchid/api/compilers/OrchidCompiler.java b/OrchidCore/src/main/java/com/eden/orchid/api/compilers/OrchidCompiler.java
index e7f407d4b2..6fb97a7543 100644
--- a/OrchidCore/src/main/java/com/eden/orchid/api/compilers/OrchidCompiler.java
+++ b/OrchidCore/src/main/java/com/eden/orchid/api/compilers/OrchidCompiler.java
@@ -1,5 +1,6 @@
 package com.eden.orchid.api.compilers;
 
+import com.eden.orchid.api.options.OptionsHolder;
 import com.eden.orchid.api.registration.Prioritized;
 
 import java.util.Map;
@@ -12,7 +13,7 @@
  * @since v1.0.0
  * @orchidApi extensible
  */
-public abstract class OrchidCompiler extends Prioritized {
+public abstract class OrchidCompiler extends Prioritized implements OptionsHolder {
 
     /**
      * Initialize the OrchidCompiler with a set priority. Compilers with a higher priority are chosen first to process a
diff --git a/OrchidCore/src/main/java/com/eden/orchid/api/compilers/OrchidParser.java b/OrchidCore/src/main/java/com/eden/orchid/api/compilers/OrchidParser.java
index acf3c24ea0..fafc21e1e0 100644
--- a/OrchidCore/src/main/java/com/eden/orchid/api/compilers/OrchidParser.java
+++ b/OrchidCore/src/main/java/com/eden/orchid/api/compilers/OrchidParser.java
@@ -1,5 +1,6 @@
 package com.eden.orchid.api.compilers;
 
+import com.eden.orchid.api.options.OptionsHolder;
 import com.eden.orchid.api.registration.Prioritized;
 
 import java.util.Map;
@@ -13,7 +14,7 @@
  * @since v1.0.0
  * @orchidApi extensible
  */
-public abstract class OrchidParser extends Prioritized {
+public abstract class OrchidParser extends Prioritized implements OptionsHolder {
 
     /**
      * If the Parser evaluates the input to be an Array structure rather than Object structure, the resulting array data
diff --git a/OrchidCore/src/main/java/com/eden/orchid/api/compilers/OrchidPrecompiler.java b/OrchidCore/src/main/java/com/eden/orchid/api/compilers/OrchidPrecompiler.java
index 22a88bc6d5..f6d4ad9eb2 100644
--- a/OrchidCore/src/main/java/com/eden/orchid/api/compilers/OrchidPrecompiler.java
+++ b/OrchidCore/src/main/java/com/eden/orchid/api/compilers/OrchidPrecompiler.java
@@ -2,6 +2,8 @@
 
 import com.eden.common.util.EdenPair;
 import com.eden.orchid.api.options.OptionsHolder;
+import com.eden.orchid.api.options.annotations.Archetype;
+import com.eden.orchid.api.options.archetypes.ConfigArchetype;
 import com.eden.orchid.api.registration.Prioritized;
 import com.eden.orchid.impl.compilers.frontmatter.FrontMatterPrecompiler;
 import com.google.inject.ImplementedBy;
@@ -17,6 +19,7 @@
  * @since v1.0.0
  */
 @ImplementedBy(FrontMatterPrecompiler.class)
+@Archetype(value = ConfigArchetype.class, key = "services.compilers.precompiler")
 public abstract class OrchidPrecompiler extends Prioritized implements OptionsHolder {
 
     /**
@@ -52,4 +55,4 @@ public OrchidPrecompiler(int priority) {
      */
     public abstract EdenPair<String, Map<String, Object>> getEmbeddedData(String extension, String input);
 
-}
\ No newline at end of file
+}
diff --git a/OrchidCore/src/main/java/com/eden/orchid/api/events/EventService.java b/OrchidCore/src/main/java/com/eden/orchid/api/events/EventService.java
index 0d8df62b76..6880491675 100644
--- a/OrchidCore/src/main/java/com/eden/orchid/api/events/EventService.java
+++ b/OrchidCore/src/main/java/com/eden/orchid/api/events/EventService.java
@@ -1,6 +1,8 @@
 package com.eden.orchid.api.events;
 
 import com.eden.orchid.api.OrchidService;
+import com.eden.orchid.api.options.annotations.Archetype;
+import com.eden.orchid.api.options.archetypes.ConfigArchetype;
 import com.google.inject.ImplementedBy;
 
 /**
@@ -66,6 +68,7 @@
  * @since v1.0.0
  */
 @ImplementedBy(EventServiceImpl.class)
+@Archetype(value = ConfigArchetype.class, key = "services.events")
 public interface EventService extends OrchidService {
 
     /**
diff --git a/OrchidCore/src/main/java/com/eden/orchid/api/generators/GeneratorServiceImpl.java b/OrchidCore/src/main/java/com/eden/orchid/api/generators/GeneratorServiceImpl.java
index c90fd1037b..cde8dfd37d 100644
--- a/OrchidCore/src/main/java/com/eden/orchid/api/generators/GeneratorServiceImpl.java
+++ b/OrchidCore/src/main/java/com/eden/orchid/api/generators/GeneratorServiceImpl.java
@@ -7,8 +7,10 @@
 import com.eden.orchid.Orchid;
 import com.eden.orchid.api.OrchidContext;
 import com.eden.orchid.api.indexing.OrchidIndex;
+import com.eden.orchid.api.options.annotations.Archetype;
 import com.eden.orchid.api.options.annotations.Description;
 import com.eden.orchid.api.options.annotations.Option;
+import com.eden.orchid.api.options.archetypes.ConfigArchetype;
 import com.eden.orchid.api.theme.Theme;
 import com.eden.orchid.api.theme.pages.OrchidPage;
 import com.eden.orchid.utilities.OrchidUtils;
@@ -33,6 +35,7 @@
  */
 @Singleton
 @Description(value = "How content gets created in your build.", name = "Generators")
+@Archetype(value = ConfigArchetype.class, key = "services.generators")
 public final class GeneratorServiceImpl implements GeneratorService {
 
     private OrchidContext context;
diff --git a/OrchidCore/src/main/java/com/eden/orchid/api/indexing/IndexServiceImpl.java b/OrchidCore/src/main/java/com/eden/orchid/api/indexing/IndexServiceImpl.java
index 12d5bcec49..2132c2b69b 100644
--- a/OrchidCore/src/main/java/com/eden/orchid/api/indexing/IndexServiceImpl.java
+++ b/OrchidCore/src/main/java/com/eden/orchid/api/indexing/IndexServiceImpl.java
@@ -8,7 +8,9 @@
 import com.eden.orchid.api.events.OrchidEventListener;
 import com.eden.orchid.api.generators.Collectible;
 import com.eden.orchid.api.generators.OrchidCollection;
+import com.eden.orchid.api.options.annotations.Archetype;
 import com.eden.orchid.api.options.annotations.Description;
+import com.eden.orchid.api.options.archetypes.ConfigArchetype;
 import com.eden.orchid.api.theme.pages.OrchidPage;
 import com.eden.orchid.utilities.CacheKt;
 import com.eden.orchid.utilities.LRUCache;
@@ -24,6 +26,7 @@
 
 @Singleton
 @Description(value = "How Orchid organizes the data it collects.", name = "Index")
+@Archetype(value = ConfigArchetype.class, key = "services.index")
 public final class IndexServiceImpl implements IndexService, OrchidEventListener {
 
     private OrchidContext context;
diff --git a/OrchidCore/src/main/java/com/eden/orchid/api/options/OptionsServiceImpl.java b/OrchidCore/src/main/java/com/eden/orchid/api/options/OptionsServiceImpl.java
index 5cb3b04a8b..8235f0c2f1 100644
--- a/OrchidCore/src/main/java/com/eden/orchid/api/options/OptionsServiceImpl.java
+++ b/OrchidCore/src/main/java/com/eden/orchid/api/options/OptionsServiceImpl.java
@@ -4,7 +4,9 @@
 import com.eden.common.util.EdenUtils;
 import com.eden.orchid.api.OrchidContext;
 import com.eden.orchid.api.compilers.TemplateTag;
+import com.eden.orchid.api.options.annotations.Archetype;
 import com.eden.orchid.api.options.annotations.Description;
+import com.eden.orchid.api.options.archetypes.ConfigArchetype;
 import com.eden.orchid.api.server.OrchidServer;
 import com.eden.orchid.api.server.OrchidView;
 import com.eden.orchid.api.theme.assets.AssetPage;
@@ -25,6 +27,7 @@
  * @orchidApi services
  */
 @Description(value = "How Orchid manages global data and configurations.", name = "Options")
+@Archetype(value = ConfigArchetype.class, key = "services.options")
 public final class OptionsServiceImpl implements OptionsService {
 
     private OrchidContext context;
diff --git a/OrchidCore/src/main/java/com/eden/orchid/api/publication/PublicationServiceImpl.java b/OrchidCore/src/main/java/com/eden/orchid/api/publication/PublicationServiceImpl.java
index 2bb3c7986f..6055a3d00a 100644
--- a/OrchidCore/src/main/java/com/eden/orchid/api/publication/PublicationServiceImpl.java
+++ b/OrchidCore/src/main/java/com/eden/orchid/api/publication/PublicationServiceImpl.java
@@ -2,8 +2,10 @@
 
 import com.eden.orchid.Orchid;
 import com.eden.orchid.api.OrchidContext;
+import com.eden.orchid.api.options.annotations.Archetype;
 import com.eden.orchid.api.options.annotations.Description;
 import com.eden.orchid.api.options.annotations.Option;
+import com.eden.orchid.api.options.archetypes.ConfigArchetype;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -14,6 +16,7 @@
  */
 @Singleton
 @Description(value = "How Orchid publishes your site to production.", name = "Publications")
+@Archetype(value = ConfigArchetype.class, key = "services.publications")
 public final class PublicationServiceImpl implements PublicationService {
 
     private OrchidContext context;
diff --git a/OrchidCore/src/main/java/com/eden/orchid/api/registration/InjectionServiceImpl.java b/OrchidCore/src/main/java/com/eden/orchid/api/registration/InjectionServiceImpl.java
index 4eccbd6bf8..6fb14d59fe 100644
--- a/OrchidCore/src/main/java/com/eden/orchid/api/registration/InjectionServiceImpl.java
+++ b/OrchidCore/src/main/java/com/eden/orchid/api/registration/InjectionServiceImpl.java
@@ -2,7 +2,9 @@
 
 import com.caseyjbrooks.clog.Clog;
 import com.eden.orchid.api.OrchidContext;
+import com.eden.orchid.api.options.annotations.Archetype;
 import com.eden.orchid.api.options.annotations.Description;
+import com.eden.orchid.api.options.archetypes.ConfigArchetype;
 import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.Module;
@@ -20,6 +22,7 @@
 import java.util.TreeSet;
 
 @Description(value = "The Orchid dependency injection container.", name = "Injection")
+@Archetype(value = ConfigArchetype.class, key = "services.injection")
 public class InjectionServiceImpl implements InjectionService {
 
     private final Stack<Pair<String, Injector>> injectorStack;
diff --git a/OrchidCore/src/main/java/com/eden/orchid/api/render/RenderService.java b/OrchidCore/src/main/java/com/eden/orchid/api/render/RenderService.java
index 9674f994b2..f248d29687 100644
--- a/OrchidCore/src/main/java/com/eden/orchid/api/render/RenderService.java
+++ b/OrchidCore/src/main/java/com/eden/orchid/api/render/RenderService.java
@@ -18,11 +18,6 @@ enum RenderMode {
         TEMPLATE, RAW, BINARY
     }
 
-    @Override
-    default String getKey() {
-        return "renderer";
-    }
-
     /**
      * Whether to exclude drafts, which is the default behavior, or whether to include them. 
      *
diff --git a/OrchidCore/src/main/java/com/eden/orchid/api/render/RenderServiceImpl.java b/OrchidCore/src/main/java/com/eden/orchid/api/render/RenderServiceImpl.java
index b27fd2d229..e835407565 100644
--- a/OrchidCore/src/main/java/com/eden/orchid/api/render/RenderServiceImpl.java
+++ b/OrchidCore/src/main/java/com/eden/orchid/api/render/RenderServiceImpl.java
@@ -1,9 +1,11 @@
 package com.eden.orchid.api.render;
 
 import com.eden.orchid.api.OrchidContext;
+import com.eden.orchid.api.options.annotations.Archetype;
 import com.eden.orchid.api.options.annotations.BooleanDefault;
 import com.eden.orchid.api.options.annotations.Description;
 import com.eden.orchid.api.options.annotations.Option;
+import com.eden.orchid.api.options.archetypes.ConfigArchetype;
 import com.eden.orchid.api.resources.resource.InlineResource;
 import com.eden.orchid.api.theme.assets.AssetPage;
 import com.eden.orchid.api.theme.pages.OrchidPage;
@@ -19,6 +21,7 @@
  * @orchidApi services
  */
 @Description(value = "How Orchid renders pages and writes them to disk.", name = "Render")
+@Archetype(value = ConfigArchetype.class, key = "services.renderer")
 public class RenderServiceImpl implements RenderService {
     protected OrchidContext context;
     protected OrchidRenderer renderer;
diff --git a/OrchidCore/src/main/java/com/eden/orchid/api/resources/ResourceServiceImpl.java b/OrchidCore/src/main/java/com/eden/orchid/api/resources/ResourceServiceImpl.java
index 01425d14ae..448621f3fc 100644
--- a/OrchidCore/src/main/java/com/eden/orchid/api/resources/ResourceServiceImpl.java
+++ b/OrchidCore/src/main/java/com/eden/orchid/api/resources/ResourceServiceImpl.java
@@ -6,9 +6,11 @@
 import com.eden.orchid.api.compilers.OrchidParser;
 import com.eden.orchid.api.events.On;
 import com.eden.orchid.api.events.OrchidEventListener;
+import com.eden.orchid.api.options.annotations.Archetype;
 import com.eden.orchid.api.options.annotations.Description;
 import com.eden.orchid.api.options.annotations.Option;
 import com.eden.orchid.api.options.annotations.StringDefault;
+import com.eden.orchid.api.options.archetypes.ConfigArchetype;
 import com.eden.orchid.api.resources.resource.ExternalResource;
 import com.eden.orchid.api.resources.resource.FileResource;
 import com.eden.orchid.api.resources.resource.OrchidResource;
@@ -54,6 +56,7 @@
  */
 @Singleton
 @Description(value = "How Orchid locates resources.", name = "Resources")
+@Archetype(value = ConfigArchetype.class, key = "services.resources")
 public final class ResourceServiceImpl implements ResourceService, OrchidEventListener {
     private OrchidContext context;
     private final List<LocalResourceSource> fileResourceSources;
@@ -285,11 +288,14 @@ public Map<String, Object> loadRemoteFile(String url) {
 
     @Override
     public @Nullable OrchidResource findClosestFile(String filename, boolean strict, int maxIterations) {
-        return findClosestFile(resourcesDir, filename, strict, maxIterations);
+        return findClosestFile(null, filename, strict, maxIterations);
     }
 
     @Override
     public @Nullable OrchidResource findClosestFile(String baseDir, String filename, boolean strict, int maxIterations) {
+        if(EdenUtils.isEmpty(baseDir)) {
+            baseDir = resourcesDir;
+        }
         File folder = new File(baseDir);
         while (true) {
             if (folder.isDirectory()) {
diff --git a/OrchidCore/src/main/java/com/eden/orchid/api/site/OrchidSite.java b/OrchidCore/src/main/java/com/eden/orchid/api/site/OrchidSite.java
index 31b35e9edf..ddac0b144d 100644
--- a/OrchidCore/src/main/java/com/eden/orchid/api/site/OrchidSite.java
+++ b/OrchidCore/src/main/java/com/eden/orchid/api/site/OrchidSite.java
@@ -35,14 +35,4 @@ default String getOrchidVersion() {
     default SiteInfo getSiteInfo() { return getService(OrchidSite.class).getSiteInfo(); }
 
     default JSONObject toJSON() { return getService(OrchidSite.class).toJSON(); }
-
-    @Override
-    default String getKey() {
-        return "site";
-    }
-
-    @Override
-    default String optionsQuery() {
-        return getKey();
-    }
 }
diff --git a/OrchidCore/src/main/java/com/eden/orchid/api/site/OrchidSiteImpl.java b/OrchidCore/src/main/java/com/eden/orchid/api/site/OrchidSiteImpl.java
index 3502ae5238..56c0df260c 100644
--- a/OrchidCore/src/main/java/com/eden/orchid/api/site/OrchidSiteImpl.java
+++ b/OrchidCore/src/main/java/com/eden/orchid/api/site/OrchidSiteImpl.java
@@ -1,8 +1,10 @@
 package com.eden.orchid.api.site;
 
 import com.eden.orchid.api.OrchidContext;
+import com.eden.orchid.api.options.annotations.Archetype;
 import com.eden.orchid.api.options.annotations.Description;
 import com.eden.orchid.api.options.annotations.Option;
+import com.eden.orchid.api.options.archetypes.ConfigArchetype;
 import com.eden.orchid.utilities.OrchidUtils;
 import com.google.inject.name.Named;
 import org.json.JSONObject;
@@ -11,6 +13,7 @@
 import java.nio.file.Paths;
 
 @Description(value = "The global configurations for your Orchid site.", name = "Site")
+@Archetype(value = ConfigArchetype.class, key = "site")
 public final class OrchidSiteImpl implements OrchidSite {
     private OrchidContext context;
     private final String orchidVersion;
diff --git a/OrchidCore/src/main/java/com/eden/orchid/api/tasks/TaskServiceImpl.java b/OrchidCore/src/main/java/com/eden/orchid/api/tasks/TaskServiceImpl.java
index 385dcc7018..7e85b9a9d0 100644
--- a/OrchidCore/src/main/java/com/eden/orchid/api/tasks/TaskServiceImpl.java
+++ b/OrchidCore/src/main/java/com/eden/orchid/api/tasks/TaskServiceImpl.java
@@ -6,9 +6,11 @@
 import com.eden.orchid.api.events.On;
 import com.eden.orchid.api.events.OrchidEvent;
 import com.eden.orchid.api.events.OrchidEventListener;
+import com.eden.orchid.api.options.annotations.Archetype;
 import com.eden.orchid.api.options.annotations.Description;
 import com.eden.orchid.api.options.annotations.IntDefault;
 import com.eden.orchid.api.options.annotations.Option;
+import com.eden.orchid.api.options.archetypes.ConfigArchetype;
 import com.eden.orchid.api.server.FileWatcher;
 import com.eden.orchid.api.server.OrchidServer;
 import com.eden.orchid.utilities.OrchidUtils;
@@ -27,6 +29,7 @@
  */
 @Singleton
 @Description(value = "How Orchid runs command line tasks and commands.", name = "Tasks")
+@Archetype(value = ConfigArchetype.class, key = "services.tasks")
 public final class TaskServiceImpl implements TaskService, OrchidEventListener {
     private OrchidContext context;
     private final Set<OrchidTask> tasks;
diff --git a/OrchidCore/src/main/java/com/eden/orchid/api/theme/ThemeServiceImpl.java b/OrchidCore/src/main/java/com/eden/orchid/api/theme/ThemeServiceImpl.java
index 1f1842a540..52e5b84aea 100644
--- a/OrchidCore/src/main/java/com/eden/orchid/api/theme/ThemeServiceImpl.java
+++ b/OrchidCore/src/main/java/com/eden/orchid/api/theme/ThemeServiceImpl.java
@@ -6,7 +6,9 @@
 import com.eden.orchid.api.OrchidContext;
 import com.eden.orchid.api.events.On;
 import com.eden.orchid.api.events.OrchidEventListener;
+import com.eden.orchid.api.options.annotations.Archetype;
 import com.eden.orchid.api.options.annotations.Description;
+import com.eden.orchid.api.options.archetypes.ConfigArchetype;
 import com.eden.orchid.api.theme.assets.AssetManager;
 import com.eden.orchid.impl.relations.ThemeRelation;
 import javax.inject.Provider;
@@ -23,6 +25,7 @@
  * @orchidApi services
  */
 @Description(value = "How Orchid manages your site's themes.", name = "Themes")
+@Archetype(value = ConfigArchetype.class, key = "services.themes")
 public final class ThemeServiceImpl implements ThemeService, OrchidEventListener {
 
     private OrchidContext context;
diff --git a/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/markdown/MarkdownCompiler.kt b/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/markdown/MarkdownCompiler.kt
index 31c214cb62..e873b8e1f5 100644
--- a/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/markdown/MarkdownCompiler.kt
+++ b/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/markdown/MarkdownCompiler.kt
@@ -1,6 +1,8 @@
 package com.eden.orchid.impl.compilers.markdown
 
 import com.eden.orchid.api.compilers.OrchidCompiler
+import com.eden.orchid.api.options.annotations.Archetype
+import com.eden.orchid.api.options.archetypes.ConfigArchetype
 import com.vladsch.flexmark.html.HtmlRenderer
 import com.vladsch.flexmark.parser.Parser
 import com.vladsch.flexmark.util.ast.IRender
@@ -12,6 +14,7 @@ import javax.inject.Singleton
 
 @Singleton
 @JvmSuppressWildcards
+@Archetype(value = ConfigArchetype::class, key = "services.compilers.md")
 class MarkdownCompiler
 @Inject
 constructor(
diff --git a/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/parsers/CSVParser.kt b/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/parsers/CSVParser.kt
index 581b6c7b9b..2b3c0a3623 100644
--- a/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/parsers/CSVParser.kt
+++ b/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/parsers/CSVParser.kt
@@ -1,6 +1,8 @@
 package com.eden.orchid.impl.compilers.parsers
 
 import com.eden.orchid.api.compilers.OrchidParser
+import com.eden.orchid.api.options.annotations.Archetype
+import com.eden.orchid.api.options.archetypes.ConfigArchetype
 import com.univocity.parsers.csv.CsvParser
 import com.univocity.parsers.csv.CsvParserSettings
 import com.univocity.parsers.tsv.TsvParser
@@ -11,6 +13,7 @@ import java.util.ArrayList
 import java.util.HashMap
 import javax.inject.Inject
 
+@Archetype(value = ConfigArchetype::class, key = "services.parsers.csv")
 class CSVParser @Inject
 constructor() : OrchidParser() {
 
diff --git a/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/parsers/JsonParser.kt b/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/parsers/JsonParser.kt
index 1dcab97706..70f372580b 100644
--- a/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/parsers/JsonParser.kt
+++ b/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/parsers/JsonParser.kt
@@ -1,12 +1,15 @@
 package com.eden.orchid.impl.compilers.parsers
 
 import com.eden.orchid.api.compilers.OrchidParser
+import com.eden.orchid.api.options.annotations.Archetype
+import com.eden.orchid.api.options.archetypes.ConfigArchetype
 import com.eden.orchid.utilities.logSyntaxError
 import org.json.JSONArray
 import org.json.JSONObject
 import java.util.regex.Pattern
 import javax.inject.Inject
 
+@Archetype(value = ConfigArchetype::class, key = "services.parsers.json")
 class JsonParser @Inject
 constructor() : OrchidParser() {
 
diff --git a/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/parsers/PropertiesParser.kt b/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/parsers/PropertiesParser.kt
index 5fe5355840..62ba4e60e6 100644
--- a/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/parsers/PropertiesParser.kt
+++ b/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/parsers/PropertiesParser.kt
@@ -1,12 +1,15 @@
 package com.eden.orchid.impl.compilers.parsers
 
 import com.eden.orchid.api.compilers.OrchidParser
+import com.eden.orchid.api.options.annotations.Archetype
+import com.eden.orchid.api.options.archetypes.ConfigArchetype
 import com.eden.orchid.utilities.SuppressedWarnings
 import java.io.StringReader
 import java.io.StringWriter
 import java.util.Properties
 import javax.inject.Inject
 
+@Archetype(value = ConfigArchetype::class, key = "services.parsers.properties")
 class PropertiesParser @Inject
 constructor() : OrchidParser(50) {
 
diff --git a/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/parsers/TOMLParser.kt b/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/parsers/TOMLParser.kt
index b9d4973516..4d5607a3b7 100644
--- a/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/parsers/TOMLParser.kt
+++ b/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/parsers/TOMLParser.kt
@@ -1,12 +1,15 @@
 package com.eden.orchid.impl.compilers.parsers
 
 import com.eden.orchid.api.compilers.OrchidParser
+import com.eden.orchid.api.options.annotations.Archetype
+import com.eden.orchid.api.options.archetypes.ConfigArchetype
 import com.eden.orchid.utilities.logSyntaxError
 import com.moandjiezana.toml.Toml
 import com.moandjiezana.toml.TomlWriter
 import java.util.regex.Pattern
 import javax.inject.Inject
 
+@Archetype(value = ConfigArchetype::class, key = "services.parsers.toml")
 class TOMLParser
 @Inject
 constructor() : OrchidParser() {
diff --git a/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/parsers/YamlParser.kt b/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/parsers/YamlParser.kt
index df19dcc955..a08f55ca00 100644
--- a/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/parsers/YamlParser.kt
+++ b/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/parsers/YamlParser.kt
@@ -2,6 +2,8 @@ package com.eden.orchid.impl.compilers.parsers
 
 import com.caseyjbrooks.clog.Clog
 import com.eden.orchid.api.compilers.OrchidParser
+import com.eden.orchid.api.options.annotations.Archetype
+import com.eden.orchid.api.options.archetypes.ConfigArchetype
 import com.eden.orchid.utilities.SuppressedWarnings
 import com.eden.orchid.utilities.logSyntaxError
 import org.yaml.snakeyaml.Yaml
@@ -9,6 +11,7 @@ import org.yaml.snakeyaml.parser.ParserException
 import java.util.HashMap
 import javax.inject.Inject
 
+@Archetype(value = ConfigArchetype::class, key = "services.parsers.yml")
 class YamlParser @Inject
 constructor() : OrchidParser() {
 
diff --git a/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/sass/SassCompiler.kt b/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/sass/SassCompiler.kt
index 0dc4260843..ffe7350039 100644
--- a/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/sass/SassCompiler.kt
+++ b/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/sass/SassCompiler.kt
@@ -3,6 +3,8 @@ package com.eden.orchid.impl.compilers.sass
 import com.caseyjbrooks.clog.Clog
 import com.eden.common.util.EdenUtils
 import com.eden.orchid.api.compilers.OrchidCompiler
+import com.eden.orchid.api.options.annotations.Archetype
+import com.eden.orchid.api.options.archetypes.ConfigArchetype
 import io.bit3.jsass.Compiler
 import io.bit3.jsass.Options
 import io.bit3.jsass.adapter.NativeAdapter
@@ -12,6 +14,7 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
+@Archetype(value = ConfigArchetype::class, key = "services.compilers.scss")
 class SassCompiler
 @Inject
 constructor(
diff --git a/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/text/HtmlCompiler.kt b/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/text/HtmlCompiler.kt
index fcfbb290d7..cb25720a6d 100644
--- a/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/text/HtmlCompiler.kt
+++ b/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/text/HtmlCompiler.kt
@@ -1,11 +1,14 @@
 package com.eden.orchid.impl.compilers.text
 
 import com.eden.orchid.api.compilers.OrchidCompiler
+import com.eden.orchid.api.options.annotations.Archetype
+import com.eden.orchid.api.options.archetypes.ConfigArchetype
 
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
+@Archetype(value = ConfigArchetype::class, key = "services.compilers.html")
 class HtmlCompiler
 @Inject
 constructor() : OrchidCompiler(800) {
diff --git a/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/text/TextCompiler.kt b/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/text/TextCompiler.kt
index 5d2b1ba774..9bd1c1dff6 100644
--- a/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/text/TextCompiler.kt
+++ b/OrchidCore/src/main/kotlin/com/eden/orchid/impl/compilers/text/TextCompiler.kt
@@ -1,11 +1,14 @@
 package com.eden.orchid.impl.compilers.text
 
 import com.eden.orchid.api.compilers.OrchidCompiler
+import com.eden.orchid.api.options.annotations.Archetype
+import com.eden.orchid.api.options.archetypes.ConfigArchetype
 
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
+@Archetype(value = ConfigArchetype::class, key = "services.compilers.txt")
 class TextCompiler
 @Inject
 constructor() : OrchidCompiler(800) {
diff --git a/OrchidCore/src/orchid/resources/changelog/0.18/0.18.2.md b/OrchidCore/src/orchid/resources/changelog/0.18/0.18.2.md
new file mode 100644
index 0000000000..c32ffd7e21
--- /dev/null
+++ b/OrchidCore/src/orchid/resources/changelog/0.18/0.18.2.md
@@ -0,0 +1,7 @@
+---
+---
+
+- Enables single-file Changelogs such as the [Keep A Changelog format](https://keepachangelog.com/en/1.0.0/). See 
+    docs {{ anchor(title='here', itemId='OrchidChangelog', pageAnchorId='file-based-single-file') }}.
+- Enables `include` directives in Asciidoc markup and changing SafeMode settings. Thanks to @tomb50 for help getting 
+    this set up!
diff --git a/OrchidCore/src/orchid/resources/config.yml b/OrchidCore/src/orchid/resources/config.yml
index d9d78b3913..d60cd41a2c 100644
--- a/OrchidCore/src/orchid/resources/config.yml
+++ b/OrchidCore/src/orchid/resources/config.yml
@@ -84,9 +84,3 @@ services:
       - type: githubReleases
         repo: 'orchidhq/orchid'
         commitish: 'master'
-
-allPages:
-  layoutConfig:
-  #  sidebarSize: ONE_THIRD
-#    sidebarSize: ONE_QUARTER
-    sidebarSize: ONE_FIFTH
diff --git a/OrchidCore/src/orchid/resources/config/kotlindoc.yml b/OrchidCore/src/orchid/resources/config/kotlindoc.yml
index 0a25faa1a8..7f5a5fe2c8 100644
--- a/OrchidCore/src/orchid/resources/config/kotlindoc.yml
+++ b/OrchidCore/src/orchid/resources/config/kotlindoc.yml
@@ -44,7 +44,7 @@ pages:
   layoutConfig:
     wrapPageInBox: false
     wrapTitleInBox: false
-    includeTitle: false
+    includeTitle: true
     includeBreadcrumbs: true
 
 moduleHomePages:
@@ -53,10 +53,13 @@ moduleHomePages:
   vcsRepo: orchidhq/orchid
   tags:
     - 'official'
-  menu:
-    - type: pageIds
-      structure: nested
-      maxLevel: 2
+  layoutConfig:
+    pageContentsMenu:
+      - type: 'separator'
+        title: 'In This Page'
+      - type: 'pageIds'
+        structure: nested
+        maxLevel: 2
 
 themesModuleHomePages:
   menu:
diff --git a/OrchidCore/src/orchid/resources/config/pages.yml b/OrchidCore/src/orchid/resources/config/pages.yml
index 475e799eee..b60420c029 100644
--- a/OrchidCore/src/orchid/resources/config/pages.yml
+++ b/OrchidCore/src/orchid/resources/config/pages.yml
@@ -4,5 +4,5 @@ staticPages:
   layoutConfig:
     wrapPageInBox: false
     wrapTitleInBox: false
-    includeTitle: false
+    includeTitle: true
     includeBreadcrumbs: false
diff --git a/OrchidCore/src/orchid/resources/config/theme/demo/Copper.yml b/OrchidCore/src/orchid/resources/config/theme/demo/Copper.yml
index 356fac12a4..08117b8d30 100644
--- a/OrchidCore/src/orchid/resources/config/theme/demo/Copper.yml
+++ b/OrchidCore/src/orchid/resources/config/theme/demo/Copper.yml
@@ -36,7 +36,7 @@ dashboardTiles:
         vertical: true
         menu:
           - type: 'github'
-            githubProject: 'javaeden/orchid'
+            githubProject: 'orchidhq/orchid'
             color: danger
   - type: 'submenu'
     color: info
diff --git a/OrchidCore/src/orchid/resources/config/wiki.yml b/OrchidCore/src/orchid/resources/config/wiki.yml
index 0217b18fe7..4bf7a5b16f 100644
--- a/OrchidCore/src/orchid/resources/config/wiki.yml
+++ b/OrchidCore/src/orchid/resources/config/wiki.yml
@@ -8,16 +8,14 @@ wikiPages:
   layoutConfig:
     wrapPageInBox: false
     wrapTitleInBox: false
-    includeTitle: false
+    includeTitle: true
     includeBreadcrumbs: true
-  menu:
-    - type: 'separator'
-      title: 'In This Page'
-      order: 100
-    - type: 'pageIds'
-      order: 110
-      structure: nested
-      maxLevel: 2
+    pageContentsMenu:
+      - type: 'separator'
+        title: 'In This Page'
+      - type: 'pageIds'
+        structure: nested
+        maxLevel: 2
 
 'user-manual':
   menu:
@@ -30,3 +28,5 @@ wikiPages:
 
 indexPages:
   template: 'wikiIndexPage'
+  layoutConfig:
+    includePageContentsMenu: false
diff --git a/OrchidCore/src/orchid/resources/templates/includes/pluginPageHeader.peb b/OrchidCore/src/orchid/resources/templates/includes/pluginPageHeader.peb
index 2de0490ba8..48cea54236 100644
--- a/OrchidCore/src/orchid/resources/templates/includes/pluginPageHeader.peb
+++ b/OrchidCore/src/orchid/resources/templates/includes/pluginPageHeader.peb
@@ -1,53 +1,15 @@
-<div style="position: relative; margin-top: 60px; margin-bottom: 60px;">
+<div>
 
   <h1 class="is-size-1 title">{{ page.title }}</h1>
   <p class="is-size-5 subtitle">{{ page.description }}</p>
 
-  {# desktop stuff #}
-  <div class="is-hidden-touch" style="position: absolute; top: 20px; right: 20px;">
-    <div>
-      <a href="https://github.com/{{ githubRepo | default('orchidhq/orchid') }}">
-        <i class="fab fa-github" aria-hidden="true"></i>
-        <span>{{ githubRepo | default('orchidhq/orchid') }}</span>
-      </a>
-    </div>
-    {% if siteUrl is not empty %}
-      <a href="{{ page.siteUrl }}" style="margin-right: 12px; white-space: nowrap">
-        <i class="fas fa-external-link-alt"></i>
-        <span>Visit site</span>
-      </a>
-    {% endif %}
-    <div>
-      <a href="https://github.com/orchidhq/orchid/edit/docs/OrchidCore/src/orchid/resources/{{ page.resource.reference.originalFullFilename }}">
-        <i class="fas fa-edit" aria-hidden="true"></i>
-        <span>Edit this page</span>
-      </a>
-    </div>
-  </div>
+{#  githubRepo, siteUrl #}
 
+  {# desktop stuff #}
   <div class="tags">
   {% for tag in page.tags %}
     <span class="tag {{ (tag == 'official') ? 'is-primary' : 'is-light' }}">{{ tag }}</span>
   {% endfor %}
   </div>
-
-  {# mobile sepcific stuff #}
-  <div class="is-hidden-desktop">
-    <a href="https://github.com/{{ githubRepo | default('orchidhq/orchid') }}" style="margin-right: 12px; white-space: nowrap">
-      <i class="fab fa-github" aria-hidden="true"></i>
-      <span>{{ githubRepo | default('orchidhq/orchid') }}</span>
-    </a>
-    {% if siteUrl is not empty %}
-      <a href="{{ page.siteUrl }}" style="margin-right: 12px; white-space: nowrap">
-        <i class="fas fa-external-link-alt"></i>
-        <span>Visit site</span>
-      </a>
-    {% endif %}
-    <a href="https://github.com/orchidhq/orchid/edit/docs/OrchidCore/src/orchid/resources/{{ page.resource.reference.originalFullFilename }}" style="margin-right: 12px; white-space: nowrap">
-      <i class="fas fa-edit" aria-hidden="true"></i>
-      <span>Edit this page</span>
-    </a>
-  </div>
-
   <hr>
 </div>
diff --git a/OrchidCore/src/orchid/resources/templates/layouts/base/sidebarBase.peb b/OrchidCore/src/orchid/resources/templates/layouts/base/sidebarBase.peb
new file mode 100644
index 0000000000..14c686f379
--- /dev/null
+++ b/OrchidCore/src/orchid/resources/templates/layouts/base/sidebarBase.peb
@@ -0,0 +1,123 @@
+{% extends 'layouts/base/layoutBase' %}
+
+{% import 'macros/listMenu' %}
+
+{% block 'body' %}
+<div class="columns is-marginless is-desktop">
+{% block hero %}
+  <div class="column is-one-third-desktop is-one-quarter-widescreen is-one-fifth-fullhd is-paddingless column-main-left is-hidden-mobile is-hidden-touch">
+  {% include 'includes/copper/hero' with {'additionalClasses': 'is-fullheight'} %}
+  </div>
+  <div class="column is-one-third-desktop is-one-quarter-widescreen is-one-fifth-fullhd is-paddingless column-main-left is-hidden-desktop">
+  {% include 'includes/copper/hero' %}
+  </div>
+{% endblock %}
+  <div class="column is-two-thirds-desktop is-three-quarters-widescreen is-four-fifths-fullhd is-paddingless column-main-right">
+  {% include 'includes/copper/navbar' %}
+    <div class="textured container" style="width: 100%;">
+    {# Breadcrumbs #}
+    {% if layoutConfig.includeBreadcrumbs %}
+    {% block breadcrumbs %}
+    {% if layoutConfig.wrapPageInBox or layoutConfig.wrapBreadcrumbsInBox %}
+      <div class="box">
+      {% breadcrumbs %}
+      </div>
+    {% else %}
+    {% breadcrumbs %}
+    {% endif %}
+    {% endblock %}
+    {% endif %}
+
+    {# Main page content #}
+    {% block main %}
+      <article style="position: relative; margin-top: 60px; margin-bottom: 60px;" role="main">
+      {% if layoutConfig.wrapPageInBox %}
+      {% if layoutConfig.includeTitle %}
+        <div class="box" style="position: relative;">
+        {{ _pageTitle(page) }}
+          <hr>
+        {{ _pageBody(page, layoutConfig) }}
+        </div>
+      {% else %}
+        <div class="box">
+        {{ _pageBody(page, layoutConfig) }}
+        </div>
+      {% endif %}
+      {% else %}
+      {% if layoutConfig.includeTitle %}
+      {% if layoutConfig.wrapTitleInBox %}
+        <div class="box">
+        {{ _pageTitle(page) }}
+        </div>
+      {% else %}
+      {{ _pageTitle(page) }}
+        <hr>
+      {% endif %}
+      {% endif %}
+      {{ _pageBody(page, layoutConfig) }}
+      {% endif %}
+      </article>
+    {% endblock %}
+      <div class="grow"></div>
+      <div class="page-footer">
+      {% block footer %}
+        {% include 'includes/copper/mainFooter' %}
+      {% endblock %}
+      </div>
+    </div>
+  </div>
+</div>
+{% endblock %}
+
+{% macro _pageTitle(page) %}
+<h2 class="title is-1 is-spaced">{{ page.title }}</h2>
+<p class="subtitle is-4">{{ page.description }}</p>
+{% endmacro %}
+
+{% macro _pageBody(page, layoutConfig) %}
+{% set hasMenu = layoutConfig.includePageContentsMenu and not layoutConfig.pageContentsMenu.isEmpty() %}
+<div class="columns">
+  <div class="column {% if hasMenu %}is-three-quarters-desktop{% else %}is-full{% endif %}">
+  {% page %}
+  </div>
+  {% if hasMenu %}
+    <div class="column is-one-quarter is-hidden-touch">
+      <div class="sticky-menu" style="position: sticky; top: 30px;">
+      {{- _listMenu(page, layoutConfig.pageContentsMenu) -}}
+      </div>
+      <script>
+        (function () {
+          'use strict';
+
+          var columnMainRight = document.querySelector(".column-main-right");
+          var content = document.querySelector("article[role=main] .content");
+          var menu = document.querySelector("article[role=main] .sticky-menu");
+
+          var section = content.querySelectorAll("h1, h2, h3, h4, h5, h6");
+          var sections = {};
+          var i = 0;
+
+          section.forEach(function (e) {
+            sections[e.id] = e.offsetTop
+          });
+          console.log(sections);
+
+          columnMainRight.addEventListener("scroll", function () {
+            var scrollPosition = columnMainRight.scrollTop;
+            for (i in sections) {
+              if (sections[i] <= scrollPosition) {
+                menu.querySelectorAll('.is-active').forEach(function (e) {
+                  e.classList.remove("is-active")
+                });
+                menu.querySelectorAll('a[href*=' + i + ']').forEach(function (e) {
+                  e.classList.add("is-active")
+                });
+              }
+            }
+          });
+        })();
+      </script>
+    </div>
+  {% endif %}
+</div>
+{% endmacro %}
diff --git a/OrchidCore/src/orchid/resources/templates/pages/kotlindocModule-bundles.peb b/OrchidCore/src/orchid/resources/templates/pages/kotlindocModule-bundles.peb
index 6c2a417919..4c35da5c9d 100644
--- a/OrchidCore/src/orchid/resources/templates/pages/kotlindocModule-bundles.peb
+++ b/OrchidCore/src/orchid/resources/templates/pages/kotlindocModule-bundles.peb
@@ -1,4 +1,4 @@
-{% include 'includes/pluginPageHeader.peb' %}
+{#{% include 'includes/pluginPageHeader.peb' %}#}
 
 <div class="content is-medium-tablet is-large-fullhd">
 {{ page.content | raw }}
diff --git a/OrchidCore/src/orchid/resources/templates/pages/kotlindocModule-plugins.peb b/OrchidCore/src/orchid/resources/templates/pages/kotlindocModule-plugins.peb
index f9c6480786..9c79fc7b8b 100644
--- a/OrchidCore/src/orchid/resources/templates/pages/kotlindocModule-plugins.peb
+++ b/OrchidCore/src/orchid/resources/templates/pages/kotlindocModule-plugins.peb
@@ -1,4 +1,4 @@
-{% include 'includes/pluginPageHeader.peb' with { 'docLink': 'docs', 'docName': 'API Documentation', 'docIcon': 'code' } %}
+{#{% include 'includes/pluginPageHeader.peb' with { 'docLink': 'docs', 'docName': 'API Documentation', 'docIcon': 'code' } %}#}
 
 <div class="content is-medium-tablet is-large-fullhd">
 {{ page.content | raw }}
diff --git a/OrchidCore/src/orchid/resources/templates/pages/kotlindocModule-themes.peb b/OrchidCore/src/orchid/resources/templates/pages/kotlindocModule-themes.peb
index 81fd677a7e..e3525a9e35 100644
--- a/OrchidCore/src/orchid/resources/templates/pages/kotlindocModule-themes.peb
+++ b/OrchidCore/src/orchid/resources/templates/pages/kotlindocModule-themes.peb
@@ -1,4 +1,4 @@
-{% include 'includes/pluginPageHeader.peb' with { 'docLink': 'demo', 'docName': 'Live Demo', 'docIcon': 'desktop' } %}
+{#{% include 'includes/pluginPageHeader.peb' with { 'docLink': 'demo', 'docName': 'Live Demo', 'docIcon': 'desktop' } %}#}
 
 <div class="content is-medium-tablet is-large-fullhd">
 {{ page.content | raw }}
diff --git a/OrchidCore/src/orchid/resources/templates/pages/staticPage-showcase.peb b/OrchidCore/src/orchid/resources/templates/pages/staticPage-showcase.peb
index cebfeecd0a..01c9cbdb33 100644
--- a/OrchidCore/src/orchid/resources/templates/pages/staticPage-showcase.peb
+++ b/OrchidCore/src/orchid/resources/templates/pages/staticPage-showcase.peb
@@ -1,4 +1,4 @@
-{% include 'includes/pluginPageHeader.peb' with { 'githubRepo': githubRepo, 'siteUrl': siteUrl } %}
+{#{% include 'includes/pluginPageHeader.peb' with { 'githubRepo': githubRepo, 'siteUrl': siteUrl } %}#}
 
 <div class="content is-medium-tablet is-large-fullhd">
 {{ page.content | raw }}
diff --git a/OrchidCore/src/orchid/resources/templates/pages/wiki.peb b/OrchidCore/src/orchid/resources/templates/pages/wiki.peb
index b31c791249..2d22de52cf 100644
--- a/OrchidCore/src/orchid/resources/templates/pages/wiki.peb
+++ b/OrchidCore/src/orchid/resources/templates/pages/wiki.peb
@@ -1,7 +1,3 @@
-<div style="margin: 0 14px;">
-{% include 'includes/pluginPageHeader.peb' with { 'docLink': 'docs', 'docName': 'API Documentation', 'docIcon': 'code' } %}
-
-  <div class="content is-medium-tablet is-large-fullhd">
-  {{ page.content | raw }}
-  </div>
+<div class="content is-medium-tablet is-large-fullhd">
+{{ page.content | raw }}
 </div>
diff --git a/OrchidCore/src/orchid/resources/templates/pages/wikiSummary.peb b/OrchidCore/src/orchid/resources/templates/pages/wikiSummary.peb
index b31c791249..3eb2aecdd8 100644
--- a/OrchidCore/src/orchid/resources/templates/pages/wikiSummary.peb
+++ b/OrchidCore/src/orchid/resources/templates/pages/wikiSummary.peb
@@ -1,5 +1,5 @@
 <div style="margin: 0 14px;">
-{% include 'includes/pluginPageHeader.peb' with { 'docLink': 'docs', 'docName': 'API Documentation', 'docIcon': 'code' } %}
+{#{% include 'includes/pluginPageHeader.peb' with { 'docLink': 'docs', 'docName': 'API Documentation', 'docIcon': 'code' } %}#}
 
   <div class="content is-medium-tablet is-large-fullhd">
   {{ page.content | raw }}
diff --git a/OrchidTest/src/main/kotlin/com/eden/orchid/strikt/html.kt b/OrchidTest/src/main/kotlin/com/eden/orchid/strikt/html.kt
index c519d487d6..52ed336c09 100644
--- a/OrchidTest/src/main/kotlin/com/eden/orchid/strikt/html.kt
+++ b/OrchidTest/src/main/kotlin/com/eden/orchid/strikt/html.kt
@@ -1,9 +1,16 @@
 package com.eden.orchid.strikt
 
 import com.eden.orchid.testhelpers.TestRenderer
+import kotlinx.html.DETAILS
 import kotlinx.html.DIV
+import kotlinx.html.HTMLTag
+import kotlinx.html.HtmlBlockTag
+import kotlinx.html.HtmlTagMarker
+import kotlinx.html.TagConsumer
+import kotlinx.html.attributesMapOf
 import kotlinx.html.div
 import kotlinx.html.stream.appendHTML
+import kotlinx.html.visit
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Comment
 import org.jsoup.nodes.Document
@@ -189,3 +196,12 @@ object CommentFilter : NodeFilter {
     override fun head(node: Node, depth: Int) =
         if (node is Comment) NodeFilter.FilterResult.REMOVE else NodeFilter.FilterResult.CONTINUE
 }
+
+
+open class SUMMARY(initialAttributes: Map<String, String>, override val consumer: TagConsumer<*>) :
+    HTMLTag("summary", consumer, initialAttributes, null, false, false), HtmlBlockTag {
+}
+
+@HtmlTagMarker
+fun DETAILS.summary(classes: String? = null, block: SUMMARY.() -> Unit = {}): Unit =
+    SUMMARY(attributesMapOf("class", classes), consumer).visit(block)
diff --git a/OrchidTest/src/main/kotlin/com/eden/orchid/strikt/isHtmlSimilar.kt b/OrchidTest/src/main/kotlin/com/eden/orchid/strikt/isHtmlSimilar.kt
index 91de52ae8d..de0750a778 100644
--- a/OrchidTest/src/main/kotlin/com/eden/orchid/strikt/isHtmlSimilar.kt
+++ b/OrchidTest/src/main/kotlin/com/eden/orchid/strikt/isHtmlSimilar.kt
@@ -134,7 +134,19 @@ private fun Attributes.hasAttributesSimilarTo(other: Attributes): Boolean {
 
             val otherKeyExists = other.hasKey(actualAttributeKey) || other.hasKey("data-$actualAttributeKey")
             val otherAttribute = if (other.hasKey(actualAttributeKey)) other.get(thisAttribute.key) else other.get("data-$actualAttributeKey")
-            if (!otherKeyExists || thisAttribute.value != otherAttribute) {
+
+            // other tag does not have a key
+            if (!otherKeyExists) {
+                return@hasAttributesSimilarTo false
+            }
+            else if(thisAttribute.value.isBlank()) {
+                // likely a boolean property, sometimes it is empty string, sometimes has value same as name
+                if(!otherAttribute.isBlank() && !listOf(thisAttribute.key, "data-$actualAttributeKey").any { it == otherAttribute }) {
+                    return@hasAttributesSimilarTo false
+                }
+            }
+            else if(thisAttribute.value != otherAttribute) {
+                // actual property, must match
                 return@hasAttributesSimilarTo false
             }
         }
diff --git a/OrchidTest/src/main/kotlin/com/eden/orchid/testhelpers/OrchidIntegrationTest.kt b/OrchidTest/src/main/kotlin/com/eden/orchid/testhelpers/OrchidIntegrationTest.kt
index 3aec0f9ba0..96933fa0ae 100644
--- a/OrchidTest/src/main/kotlin/com/eden/orchid/testhelpers/OrchidIntegrationTest.kt
+++ b/OrchidTest/src/main/kotlin/com/eden/orchid/testhelpers/OrchidIntegrationTest.kt
@@ -73,8 +73,6 @@ open class OrchidIntegrationTest(
 
         flag("task", "serve")
         flag("port", port)
-        flag("src", "./src")
-        flag("dest", "./build/orchid/test")
         this.serve = true
     }
 
diff --git a/OrchidTest/src/main/kotlin/com/eden/orchid/testhelpers/TestOrchid.kt b/OrchidTest/src/main/kotlin/com/eden/orchid/testhelpers/TestOrchid.kt
index 71e941d756..2f7bc51b1c 100644
--- a/OrchidTest/src/main/kotlin/com/eden/orchid/testhelpers/TestOrchid.kt
+++ b/OrchidTest/src/main/kotlin/com/eden/orchid/testhelpers/TestOrchid.kt
@@ -28,6 +28,9 @@ class TestOrchid {
         if (!actualFlags.containsKey("baseUrl")) {
             actualFlags["baseUrl"] = "http://orchid.test"
         }
+        if (!actualFlags.containsKey("dest")) {
+            actualFlags["dest"] =  "./build/orchid/test"
+        }
 
         // setup original modules
         val modules = mutableListOf(
diff --git a/OrchidTest/src/test/kotlin/com/eden/orchid/impl/publication/ScriptPublisherTest.kt b/OrchidTest/src/test/kotlin/com/eden/orchid/impl/publication/ScriptPublisherTest.kt
index 9bef8a3b63..c9689e3879 100644
--- a/OrchidTest/src/test/kotlin/com/eden/orchid/impl/publication/ScriptPublisherTest.kt
+++ b/OrchidTest/src/test/kotlin/com/eden/orchid/impl/publication/ScriptPublisherTest.kt
@@ -44,6 +44,7 @@ class ScriptPublisherTest : OrchidIntegrationTest(), ClogLogger {
     @Test
     fun test01() {
         flag("task", "deploy")
+        flag("src", ".")
         configObject(
             "services", """
             |{
@@ -89,4 +90,4 @@ class ScriptPublisherTest : OrchidIntegrationTest(), ClogLogger {
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/gradle/actions/testing.gradle b/gradle/actions/testing.gradle
index 4d917993ec..3e031053cd 100644
--- a/gradle/actions/testing.gradle
+++ b/gradle/actions/testing.gradle
@@ -6,12 +6,16 @@ test {
         showStandardStreams = true
         exceptionFormat = 'full'
     }
+    reports {
+        junitXml.enabled = true
+        html.enabled = true
+    }
 }
 
 jacocoTestReport {
     reports {
         xml.enabled true
-        html.enabled false
+        html.enabled true
     }
 }
 check.dependsOn jacocoTestReport
diff --git a/languageExtensions/OrchidAsciidoc/README.md b/languageExtensions/OrchidAsciidoc/README.md
index e2e43fae59..b0c7c5154f 100644
--- a/languageExtensions/OrchidAsciidoc/README.md
+++ b/languageExtensions/OrchidAsciidoc/README.md
@@ -98,4 +98,44 @@ Of course, you may also embed chunks of AsciiDoc markup within content of other
 = AsciiDoc Header
 {% endfilter %}
 {%- endverbatim %}
+
+```
+
+### Includes
+
+Files can be included using the standard `include::[]` directive. File paths are all absolute, and resolved relative to
+your site resources root. Nested relative includes are not currently supported.
+
+```asciidoc
+= homepage.adoc
+
+include::other_page.adoc[]
+```
+
+### Images
+
+Images are not currently supported. Local images references by the `image::[]` macro will not be copied to the final
+site automatically, so you should stick with external URLs for now.
+
+```asciidoc
+= homepage.adoc
+
+image::https://picsum.photos/200/300.jpg[]
 ```
+
+### Safe Mode
+
+AsciiDoc security rules (as defined in 
+[Running AsciiDoctor Securely](https://asciidoctor.org/docs/user-manual/#running-asciidoctor-securely)) can be 
+optionally configured via the 'asciiDocSafeMode' key under the `services.compilers.adoc` section of the config.yml 
+equivalent. 
+
+By default, the safe mode is set to `SAFE`, which enables the popular `includes::[]` directive. Tightening the security 
+mode as per the below to config.yml will disable this as required.
+
+```text
+services:
+  compilers:
+    adoc:
+      safeMode: 'SECURE'
+  ``````
diff --git a/languageExtensions/OrchidAsciidoc/src/main/kotlin/com/eden/orchid/languages/asciidoc/AsciiDoctorCompiler.kt b/languageExtensions/OrchidAsciidoc/src/main/kotlin/com/eden/orchid/languages/asciidoc/AsciiDoctorCompiler.kt
index e584643602..3900a35466 100644
--- a/languageExtensions/OrchidAsciidoc/src/main/kotlin/com/eden/orchid/languages/asciidoc/AsciiDoctorCompiler.kt
+++ b/languageExtensions/OrchidAsciidoc/src/main/kotlin/com/eden/orchid/languages/asciidoc/AsciiDoctorCompiler.kt
@@ -1,25 +1,56 @@
 package com.eden.orchid.languages.asciidoc
 
 import com.caseyjbrooks.clog.Clog
+import com.eden.orchid.api.OrchidContext
 import com.eden.orchid.api.compilers.OrchidCompiler
+import com.eden.orchid.api.options.annotations.Archetype
+import com.eden.orchid.api.options.annotations.Description
+import com.eden.orchid.api.options.annotations.Option
+import com.eden.orchid.api.options.annotations.StringDefault
+import com.eden.orchid.api.options.archetypes.ConfigArchetype
+import com.eden.orchid.languages.asciidoc.extensions.AsciidocIncludeProcessor
 import org.asciidoctor.Asciidoctor
 import org.asciidoctor.Options
+import org.asciidoctor.SafeMode
 import org.asciidoctor.log.LogHandler
 import org.asciidoctor.log.LogRecord
 import org.asciidoctor.log.Severity
 import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Provider
 import javax.inject.Singleton
 
 @Singleton
+@Archetype(value = ConfigArchetype::class, key = "services.compilers.adoc")
 class AsciiDoctorCompiler
 @Inject
-constructor() : OrchidCompiler(800), LogHandler {
+constructor(
+    @Named("src") private val resourcesDir: String,
+    includeProcessor: AsciidocIncludeProcessor
+) : OrchidCompiler(800), LogHandler {
 
     private val asciidoctor: Asciidoctor = Asciidoctor.Factory.create()
-    private val options: Options = Options()
+    private lateinit var options: Options
 
+    @Option
+    @Description("Customize the security level Asciidoctor will run under. One of [UNSAFE, SAFE, SERVER, SECURE]")
+    @StringDefault("SAFE")
+    lateinit var safeMode: SafeMode
+
+    // register Asciidoctor instance, once during entire Orchid lifetime
     init {
         asciidoctor.registerLogHandler(this)
+        asciidoctor.javaExtensionRegistry().apply {
+            includeProcessor(includeProcessor)
+        }
+    }
+
+    // configure parsing options from options, before each build phase
+    override fun onPostExtraction() {
+        options = Options()
+        options.setSafe(safeMode)
+        // files can be included relative to the default resources directory
+        options.setBaseDir(resourcesDir)
     }
 
     override fun compile(extension: String, source: String, data: Map<String, Any>): String {
@@ -38,13 +69,13 @@ constructor() : OrchidCompiler(800), LogHandler {
         if (logRecord == null) return
 
         when (logRecord.severity) {
-            Severity.DEBUG   -> Clog.d(logRecord.message)
-            Severity.INFO    -> Clog.i(logRecord.message)
-            Severity.WARN    -> Clog.w(logRecord.message)
-            Severity.ERROR   -> Clog.e(logRecord.message)
-            Severity.FATAL   -> Clog.e(logRecord.message)
+            Severity.DEBUG -> Clog.d(logRecord.message)
+            Severity.INFO -> Clog.i(logRecord.message)
+            Severity.WARN -> Clog.w(logRecord.message)
+            Severity.ERROR -> Clog.e(logRecord.message)
+            Severity.FATAL -> Clog.e(logRecord.message)
             Severity.UNKNOWN -> Clog.d(logRecord.message)
-            else             -> Clog.d(logRecord.message)
+            else -> Clog.d(logRecord.message)
         }
     }
 }
diff --git a/languageExtensions/OrchidAsciidoc/src/main/kotlin/com/eden/orchid/languages/asciidoc/extensions/AsciidocIncludeProcessor.kt b/languageExtensions/OrchidAsciidoc/src/main/kotlin/com/eden/orchid/languages/asciidoc/extensions/AsciidocIncludeProcessor.kt
new file mode 100644
index 0000000000..76f4467db0
--- /dev/null
+++ b/languageExtensions/OrchidAsciidoc/src/main/kotlin/com/eden/orchid/languages/asciidoc/extensions/AsciidocIncludeProcessor.kt
@@ -0,0 +1,50 @@
+package com.eden.orchid.languages.asciidoc.extensions
+
+import com.eden.orchid.api.OrchidContext
+import com.eden.orchid.utilities.OrchidUtils
+import org.asciidoctor.ast.Document
+import org.asciidoctor.extension.IncludeProcessor
+import org.asciidoctor.extension.PreprocessorReader
+import java.io.File
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Provider
+
+class AsciidocIncludeProcessor
+@Inject
+constructor(
+    private var contextProvider: Provider<OrchidContext>,
+    @Named("src") private val resourcesDir: String
+) : IncludeProcessor() {
+
+    private val context by lazy { contextProvider.get() }
+
+    override fun process(
+        document: Document?,
+        reader: PreprocessorReader?,
+        target: String?,
+        attributes: MutableMap<String, Any>?
+    ) {
+        val resource = context.getLocalResourceEntry(target)
+
+        reader?.push_include(
+            resource.rawContent,
+            target,
+            resource.reference.originalFullFileName,
+            1,
+            attributes
+        )
+    }
+
+    override fun handles(target: String?): Boolean {
+        // if there's a file relative to the base dir, don't handle it here. Let Asciidoctor do that, which preserves
+        // all the attrs it can normally handle. Only if a file cannot be found, should we attempt to handle it, and
+        // then we can check Orchid resources as a fallback
+
+        return when {
+            OrchidUtils.isExternal(target) -> false
+            File(resourcesDir).resolve(target ?: "").exists() -> false
+            else -> true
+        }
+    }
+}
diff --git a/languageExtensions/OrchidAsciidoc/src/test/kotlin/com/eden/orchid/languages/asciidoc/AsciidocTest.kt b/languageExtensions/OrchidAsciidoc/src/test/kotlin/com/eden/orchid/languages/asciidoc/AsciidocTest.kt
index f3fda032d0..299f349e41 100644
--- a/languageExtensions/OrchidAsciidoc/src/test/kotlin/com/eden/orchid/languages/asciidoc/AsciidocTest.kt
+++ b/languageExtensions/OrchidAsciidoc/src/test/kotlin/com/eden/orchid/languages/asciidoc/AsciidocTest.kt
@@ -8,12 +8,15 @@ import com.eden.orchid.strikt.pageWasRendered
 import com.eden.orchid.strikt.select
 import com.eden.orchid.testhelpers.OrchidIntegrationTest
 import com.eden.orchid.testhelpers.withGenerator
+import kotlinx.html.a
 import kotlinx.html.div
 import kotlinx.html.p
 import kotlinx.html.strong
 import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.condition.DisabledIf
 import strikt.api.expectThat
 
 @DisplayName("Tests behavior of using Asciidoc for the homepage")
@@ -93,4 +96,245 @@ class AsciidocTest : OrchidIntegrationTest(withGenerator<HomepageGenerator>()) {
             }
     }
 
-}
\ No newline at end of file
+// Test safe mode configuration
+//----------------------------------------------------------------------------------------------------------------------
+
+    @Test
+    @DisplayName("Test that Asciidoc native file includes are disabled with secure safe-mode.")
+    fun test04() {
+        resource(
+            "homepage.ad",
+            """
+            |**Asciidoc Page**
+            |
+            |include::test/resources/secure_include.ad[]
+            """.trimMargin()
+        )
+        configObject(
+            "services",
+            """
+            {
+                "compilers": {
+                    "adoc": {
+                        "safeMode": "SECURE"
+                    }
+                }
+            }
+            """.trimIndent()
+        )
+
+        expectThat(execute(AsciidocModule()))
+            .pageWasRendered("/index.html") {
+                get { content }
+                    .asHtml()
+                    .select("body") {
+                        innerHtmlMatches {
+                            div("paragraph") {
+                                p {
+                                    strong {
+                                        +"Asciidoc Page"
+                                    }
+                                }
+                            }
+                            // when secure, the contents are not loaded
+                            div("paragraph") {
+                                p {
+                                    a(href = "test/resources/secure_include.ad", classes = "bare") {
+                                        +"test/resources/secure_include.ad"
+                                    }
+                                }
+                            }
+                        }
+                    }
+            }
+    }
+
+    @Test
+    @DisplayName("Test that Asciidoc fallback Orchid resource includes are enabled with secure safe-mode.")
+    fun test05() {
+        resource(
+            "homepage.ad",
+            """
+            |**Asciidoc Page**
+            |
+            |include::secure_include_resource.ad[]
+            """.trimMargin()
+        )
+        resource(
+            "secure_include_resource.ad",
+            """
+            |Included from resource
+            """.trimMargin()
+        )
+        configObject(
+            "services",
+            """
+            {
+                "compilers": {
+                    "adoc": {
+                        "safeMode": "SECURE"
+                    }
+                }
+            }
+            """.trimIndent()
+        )
+
+        expectThat(execute(AsciidocModule()))
+            .pageWasRendered("/index.html") {
+                get { content }
+                    .asHtml()
+                    .select("body") {
+                        innerHtmlMatches {
+                            div("paragraph") {
+                                p {
+                                    strong {
+                                        +"Asciidoc Page"
+                                    }
+                                }
+                            }
+                            // when secure, the contents are not loaded
+                            div("paragraph") {
+                                p {
+                                    +"Included from resource"
+                                }
+                            }
+                        }
+                    }
+            }
+    }
+
+    @Test
+    @DisplayName("Test that Asciidoc native file includes are enabled with default safe-mode.")
+    fun test06() {
+        resource(
+            "homepage.ad",
+            """
+            |**Asciidoc Page**
+            |
+            |include::test/resources/secure_include.ad[]
+            """.trimMargin()
+        )
+
+        expectThat(execute(AsciidocModule()))
+            .pageWasRendered("/index.html") {
+                get { content }
+                    .asHtml()
+                    .select("body") {
+                        innerHtmlMatches {
+                            div("paragraph") {
+                                p {
+                                    strong {
+                                        +"Asciidoc Page"
+                                    }
+                                }
+                            }
+                            div("paragraph") {
+                                p {
+                                    +"Included from file"
+                                }
+                            }
+                        }
+                    }
+            }
+    }
+
+    @Test
+    @DisplayName("Test that Asciidoc fallback Orchid resource includes are enabled with secure safe-mode.")
+    fun test07() {
+        resource(
+            "homepage.ad",
+            """
+            |**Asciidoc Page**
+            |
+            |include::secure_include_resource.ad[]
+            """.trimMargin()
+        )
+        resource(
+            "secure_include_resource.ad",
+            """
+            |Included from resource
+            """.trimMargin()
+        )
+
+        expectThat(execute(AsciidocModule()))
+            .pageWasRendered("/index.html") {
+                get { content }
+                    .asHtml()
+                    .select("body") {
+                        innerHtmlMatches {
+                            div("paragraph") {
+                                p {
+                                    strong {
+                                        +"Asciidoc Page"
+                                    }
+                                }
+                            }
+                            // when secure, the contents are not loaded
+                            div("paragraph") {
+                                p {
+                                    +"Included from resource"
+                                }
+                            }
+                        }
+                    }
+            }
+    }
+
+    @Test
+    @DisplayName("Test that Asciidoc partial includes work properly")
+    fun test08() {
+        resource(
+            "homepage.ad",
+            """
+            |**Asciidoc Page**
+            |
+            |before included block 1
+            |
+            |include::test/resources/included_tags.ad[tags=includedBlock1]
+            |
+            |after included block 1
+            |
+            |before included block 2
+            |
+            |include::test/resources/included_tags.ad[tags=includedBlock2]
+            |
+            |after included block 2
+            """.trimMargin()
+        )
+
+        expectThat(execute(AsciidocModule()))
+            .pageWasRendered("/index.html") {
+                get { content }
+                    .asHtml()
+                    .select("body") {
+                        innerHtmlMatches {
+                            div("paragraph") {
+                                p {
+                                    strong { +"Asciidoc Page" }
+                                }
+                            }
+                            div("paragraph") {
+                                p { +"before included block 1" }
+                            }
+                            div("paragraph") {
+                                p { +"Content in block 1" }
+                            }
+                            div("paragraph") {
+                                p { +"after included block 1" }
+                            }
+
+                            div("paragraph") {
+                                p { +"before included block 2" }
+                            }
+                            div("paragraph") {
+                                p { +"Content in block 2" }
+                            }
+                            div("paragraph") {
+                                p { +"after included block 2" }
+                            }
+                        }
+                    }
+            }
+    }
+
+}
diff --git a/languageExtensions/OrchidAsciidoc/src/test/resources/included_tags.ad b/languageExtensions/OrchidAsciidoc/src/test/resources/included_tags.ad
new file mode 100644
index 0000000000..d65329ad5d
--- /dev/null
+++ b/languageExtensions/OrchidAsciidoc/src/test/resources/included_tags.ad
@@ -0,0 +1,7 @@
+tag::includedBlock1[]
+Content in block 1
+end::includedBlock1[]
+
+tag::includedBlock2[]
+Content in block 2
+end::includedBlock2[]
diff --git a/languageExtensions/OrchidAsciidoc/src/test/resources/secure_include.ad b/languageExtensions/OrchidAsciidoc/src/test/resources/secure_include.ad
new file mode 100644
index 0000000000..81aac0af20
--- /dev/null
+++ b/languageExtensions/OrchidAsciidoc/src/test/resources/secure_include.ad
@@ -0,0 +1 @@
+Included from file
diff --git a/languageExtensions/OrchidDiagrams/src/main/kotlin/com/eden/orchid/languages/diagrams/PlantUmlCompiler.kt b/languageExtensions/OrchidDiagrams/src/main/kotlin/com/eden/orchid/languages/diagrams/PlantUmlCompiler.kt
index dbf8233b12..539970ae1a 100644
--- a/languageExtensions/OrchidDiagrams/src/main/kotlin/com/eden/orchid/languages/diagrams/PlantUmlCompiler.kt
+++ b/languageExtensions/OrchidDiagrams/src/main/kotlin/com/eden/orchid/languages/diagrams/PlantUmlCompiler.kt
@@ -1,6 +1,8 @@
 package com.eden.orchid.languages.diagrams
 
 import com.eden.orchid.api.compilers.OrchidCompiler
+import com.eden.orchid.api.options.annotations.Archetype
+import com.eden.orchid.api.options.archetypes.ConfigArchetype
 import net.sourceforge.plantuml.FileFormat
 import net.sourceforge.plantuml.FileFormatOption
 import net.sourceforge.plantuml.SourceStringReader
@@ -11,6 +13,7 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
+@Archetype(value = ConfigArchetype::class, key = "services.compilers.puml")
 class PlantUmlCompiler
 @Inject
 constructor() : OrchidCompiler(800) {
diff --git a/plugins/OrchidChangelog/README.md b/plugins/OrchidChangelog/README.md
index 7c55e4d961..1bc3b977af 100644
--- a/plugins/OrchidChangelog/README.md
+++ b/plugins/OrchidChangelog/README.md
@@ -31,7 +31,8 @@ You may also include the `changelog` component on any page to render a listing o
 
 ## Usage
 
-### Basic Usage
+### Directory-Based (multi-file)
+
 Changelog versions are created as files sitting in the `changelog/` directory of your site content. The filenames should
 be the version name, and they can be put in subdirectories for better organization. Alternatively, you can name the 
 files something different and set the `version` property in each entry's Front Matter.
@@ -81,6 +82,51 @@ just major, minor, and patch versions.
 
 Bumps between changelog versions are detected automatically. 
 
+### File-Based (single file)
+
+Singe version 0.18.2, Orchid now supports single-file changelog formats such as 
+[Keep A Changelog](https://keepachangelog.com/en/1.0.0/). In such formats, all versions of the software are documented 
+in a single file, usually in the repository root in a file called `CHANGELOG.md` or something similar. OrchidChangelog
+will locate this file, parse the individual versions from it based on a specified header regex, and construct your site
+changelogs from these entries.
+
+The following configuration will change from the default directory-based changelogs to the file-based format:
+
+```yaml
+changelog:
+  adapter: 
+    type: "file"           # required
+    baseDir: "./docs"      # optional, change the directory to search for the changelog file in. Defaults to resources root dir
+    filename: "CHANGES.md" # optional, the name of the file to look for
+    versionRegex: '...'    # optional, change the regex used to locate version header lines in the file. Defaults to Markdown headers of level 1 or 2
+```
+
+The default syntax for a Changelog version header is a Markdown header of level 1 or 2, which contains the version name
+and an optional release date in `YYYY-MM-DD` format. Versions are usually listed in the file in reverse-chronological 
+order.
+
+```markdown
+## 1.1.0
+
+- Unreleased version
+
+## 1.0.0 - 2017-08-20
+
+- Major version release
+
+## 0.2.1 - 2017-07-09
+
+- Patch version release
+
+## 0.2.0 - 2017-07-08
+
+- Minor version release
+
+## 0.1.0 - 2017-06-20
+
+- Initial release
+```
+
 ### Customizing `versions.json`
 
 Orchid creates a `meta/versions.json` file, which is an index of the "important" versions that others would need to know
@@ -101,3 +147,4 @@ In addition, you can have the release notes for each version added included with
 changelog:
   includeReleaseNotes: true
 ```
+
diff --git a/plugins/OrchidChangelog/src/main/kotlin/com/eden/orchid/changelog/ChangelogGenerator.kt b/plugins/OrchidChangelog/src/main/kotlin/com/eden/orchid/changelog/ChangelogGenerator.kt
index 15f5f7f904..979fff760e 100644
--- a/plugins/OrchidChangelog/src/main/kotlin/com/eden/orchid/changelog/ChangelogGenerator.kt
+++ b/plugins/OrchidChangelog/src/main/kotlin/com/eden/orchid/changelog/ChangelogGenerator.kt
@@ -9,12 +9,11 @@ import com.eden.orchid.api.options.annotations.StringDefault
 import com.eden.orchid.api.resources.resource.JsonResource
 import com.eden.orchid.api.theme.pages.OrchidPage
 import com.eden.orchid.api.theme.pages.OrchidReference
+import com.eden.orchid.changelog.adapter.ChangelogAdapter
 import com.eden.orchid.changelog.model.ChangelogModel
 import com.eden.orchid.changelog.model.ChangelogVersion
-import com.eden.orchid.utilities.OrchidUtils
 import org.json.JSONArray
 import org.json.JSONObject
-import javax.inject.Inject
 
 @Description("Track changes and create references to all versions of your project.", name = "Changelog")
 class ChangelogGenerator : OrchidGenerator<ChangelogModel>(GENERATOR_KEY, PRIORITY_DEFAULT) {
@@ -23,11 +22,6 @@ class ChangelogGenerator : OrchidGenerator<ChangelogModel>(GENERATOR_KEY, PRIORI
         const val GENERATOR_KEY = "changelog"
     }
 
-    @Option
-    @StringDefault("changelog")
-    @Description("The base directory in local resources to look for changelog entries in.")
-    lateinit var baseDir: String
-
     @Option
     @Description("Whether to include minor versions in the versions.json file.")
     var includeMinorVersions: Boolean = false
@@ -36,11 +30,6 @@ class ChangelogGenerator : OrchidGenerator<ChangelogModel>(GENERATOR_KEY, PRIORI
     @Description("Whether to include release notes for each entry in the versions.json file.")
     var includeReleaseNotes: Boolean = false
 
-    @Option
-    @StringDefault("{major}.{minor}.{patch}")
-    @Description("The format your changelog version follow.")
-    lateinit var format: String
-
     @Option
     @Description(
         "The properties of your format to order by as keys, with their type as values. The values should be " +
@@ -48,13 +37,12 @@ class ChangelogGenerator : OrchidGenerator<ChangelogModel>(GENERATOR_KEY, PRIORI
     )
     lateinit var orderBy: JSONObject
 
+    @Option
+    @StringDefault("directory")
+    lateinit var adapter: ChangelogAdapter
+
     override fun startIndexing(context: OrchidContext): ChangelogModel {
-        var versions = context.getLocalResourceEntries(
-            OrchidUtils.normalizePath(baseDir),
-            context.compilerExtensions.toTypedArray(),
-            true
-        )
-            .map { ChangelogVersion(context, format, it.reference.originalFileName, it) }
+        var versions = adapter.loadChangelogEntries(context)
 
         var comparator: Comparator<ChangelogVersion>? = null
 
@@ -143,18 +131,16 @@ class ChangelogGenerator : OrchidGenerator<ChangelogModel>(GENERATOR_KEY, PRIORI
     }
 
     private fun ChangelogVersion.checkBump(previous: ChangelogVersion?) {
-        for(componentKey in versionComponents.keys) {
-            val shouldBump = if(previous == null) {
+        for (componentKey in versionComponents.keys) {
+            val shouldBump = if (previous == null) {
                 true
-            }
-            else if(versionComponents[componentKey]?.first != previous.versionComponents[componentKey]?.first) {
+            } else if (versionComponents[componentKey]?.first != previous.versionComponents[componentKey]?.first) {
                 true
-            }
-            else {
+            } else {
                 false
             }
 
-            if(shouldBump) {
+            if (shouldBump) {
                 versionComponents[componentKey] = versionComponents[componentKey]!!.copy(second = true)
             }
         }
diff --git a/plugins/OrchidChangelog/src/main/kotlin/com/eden/orchid/changelog/ChangelogModule.kt b/plugins/OrchidChangelog/src/main/kotlin/com/eden/orchid/changelog/ChangelogModule.kt
index acccbf74cc..aa191e704b 100644
--- a/plugins/OrchidChangelog/src/main/kotlin/com/eden/orchid/changelog/ChangelogModule.kt
+++ b/plugins/OrchidChangelog/src/main/kotlin/com/eden/orchid/changelog/ChangelogModule.kt
@@ -4,6 +4,9 @@ import com.eden.orchid.api.generators.OrchidGenerator
 import com.eden.orchid.api.publication.OrchidPublisher
 import com.eden.orchid.api.registration.OrchidModule
 import com.eden.orchid.api.theme.components.OrchidComponent
+import com.eden.orchid.changelog.adapter.ChangelogAdapter
+import com.eden.orchid.changelog.adapter.ChangelogDirAdapter
+import com.eden.orchid.changelog.adapter.ChangelogFileAdapter
 import com.eden.orchid.changelog.components.ChangelogComponent
 import com.eden.orchid.changelog.publication.RequiredChangelogVersionPublisher
 import com.eden.orchid.utilities.addToSet
@@ -16,7 +19,11 @@ class ChangelogModule : OrchidModule() {
         addToSet<OrchidGenerator<*>, ChangelogGenerator>()
         addToSet<OrchidPublisher, RequiredChangelogVersionPublisher>()
         addToSet<OrchidComponent, ChangelogComponent>()
-    }
 
+        addToSet<ChangelogAdapter>(
+            ChangelogDirAdapter::class,
+            ChangelogFileAdapter::class
+        )
+    }
 }
 
diff --git a/plugins/OrchidChangelog/src/main/kotlin/com/eden/orchid/changelog/adapter/ChangelogAdapter.kt b/plugins/OrchidChangelog/src/main/kotlin/com/eden/orchid/changelog/adapter/ChangelogAdapter.kt
new file mode 100644
index 0000000000..1d9b4a4a9f
--- /dev/null
+++ b/plugins/OrchidChangelog/src/main/kotlin/com/eden/orchid/changelog/adapter/ChangelogAdapter.kt
@@ -0,0 +1,10 @@
+package com.eden.orchid.changelog.adapter
+
+import com.eden.orchid.api.OrchidContext
+import com.eden.orchid.api.theme.components.ModularType
+import com.eden.orchid.changelog.model.ChangelogVersion
+
+interface ChangelogAdapter : ModularType {
+
+    fun loadChangelogEntries(context: OrchidContext): List<ChangelogVersion>
+}
diff --git a/plugins/OrchidChangelog/src/main/kotlin/com/eden/orchid/changelog/adapter/ChangelogDirAdapter.kt b/plugins/OrchidChangelog/src/main/kotlin/com/eden/orchid/changelog/adapter/ChangelogDirAdapter.kt
new file mode 100644
index 0000000000..079a8c3053
--- /dev/null
+++ b/plugins/OrchidChangelog/src/main/kotlin/com/eden/orchid/changelog/adapter/ChangelogDirAdapter.kt
@@ -0,0 +1,35 @@
+package com.eden.orchid.changelog.adapter
+
+import com.eden.orchid.api.OrchidContext
+import com.eden.orchid.api.options.annotations.Archetype
+import com.eden.orchid.api.options.annotations.Description
+import com.eden.orchid.api.options.annotations.Option
+import com.eden.orchid.api.options.annotations.StringDefault
+import com.eden.orchid.api.options.archetypes.ConfigArchetype
+import com.eden.orchid.changelog.ChangelogGenerator
+import com.eden.orchid.changelog.model.ChangelogVersion
+import com.eden.orchid.utilities.OrchidUtils
+
+@Archetype(value = ConfigArchetype::class, key = ChangelogGenerator.GENERATOR_KEY)
+class ChangelogDirAdapter : ChangelogAdapter {
+
+    @Option
+    @StringDefault("changelog")
+    @Description("The base directory in local resources to look for changelog entries in.")
+    lateinit var baseDir: String
+
+    @Option
+    @StringDefault("{major}.{minor}.{patch}")
+    @Description("The format your changelog version follow.")
+    lateinit var format: String
+
+    override fun getType() = "directory"
+
+    override fun loadChangelogEntries(context: OrchidContext): List<ChangelogVersion> {
+        return context.getLocalResourceEntries(
+            OrchidUtils.normalizePath(baseDir),
+            context.compilerExtensions.toTypedArray(),
+            true
+        ).map { ChangelogVersion(context, format, it.reference.originalFileName, null, it) }
+    }
+}
diff --git a/plugins/OrchidChangelog/src/main/kotlin/com/eden/orchid/changelog/adapter/ChangelogFileAdapter.kt b/plugins/OrchidChangelog/src/main/kotlin/com/eden/orchid/changelog/adapter/ChangelogFileAdapter.kt
new file mode 100644
index 0000000000..c1640e7da4
--- /dev/null
+++ b/plugins/OrchidChangelog/src/main/kotlin/com/eden/orchid/changelog/adapter/ChangelogFileAdapter.kt
@@ -0,0 +1,100 @@
+package com.eden.orchid.changelog.adapter
+
+import com.caseyjbrooks.clog.Clog
+import com.eden.orchid.api.OrchidContext
+import com.eden.orchid.api.options.annotations.Archetype
+import com.eden.orchid.api.options.annotations.Description
+import com.eden.orchid.api.options.annotations.IntDefault
+import com.eden.orchid.api.options.annotations.Option
+import com.eden.orchid.api.options.annotations.StringDefault
+import com.eden.orchid.api.options.archetypes.ConfigArchetype
+import com.eden.orchid.api.resources.resource.StringResource
+import com.eden.orchid.changelog.ChangelogGenerator
+import com.eden.orchid.changelog.model.ChangelogVersion
+import com.eden.orchid.utilities.OrchidUtils
+
+@Archetype(value = ConfigArchetype::class, key = ChangelogGenerator.GENERATOR_KEY)
+class ChangelogFileAdapter : ChangelogAdapter {
+
+    @Option
+    @StringDefault("CHANGELOG")
+    @Description("The name of the changelog file.")
+    lateinit var filename: String
+
+    @Option
+    @Description("The base directory to start searching for the changelog file.")
+    lateinit var baseDir: String
+
+    @Option
+    @StringDefault("{major}.{minor}.{patch}")
+    @Description("The format your changelog versions follow.")
+    lateinit var format: String
+
+    @Option
+    @StringDefault("^#{1,2}\\s*?(.*?)\\s*?(?:[-/](.*?))?\$")
+    @Description("The format your changelog version follow.")
+    lateinit var versionRegex: String
+
+    @Option
+    @IntDefault(1)
+    var versionRegexGroup: Int = 1
+
+    @Option
+    @IntDefault(2)
+    var releaseDateRegexGroup: Int = 2
+
+    override fun getType() = "file"
+
+    override fun loadChangelogEntries(context: OrchidContext): List<ChangelogVersion> {
+        val readme = context.locateLocalResourceEntry(filename, context.compilerExtensions.toTypedArray())
+            ?: context.findClosestFile(baseDir, filename, false, 10)
+
+        if(readme == null) {
+            Clog.w("Changelog file not found")
+            return emptyList()
+        }
+
+        val regex = versionRegex.toRegex(RegexOption.MULTILINE)
+        var currentVersion: String? = null
+        var currentVersionReleaseDate: String? = null
+        var previousIndex = 0
+
+        val content = readme.rawContent
+
+        val changelogVersions = mutableListOf<ChangelogVersion>()
+
+        regex.findAll(content).forEach {
+            if(currentVersion != null) {
+                changelogVersions += ChangelogVersion(
+                    context,
+                    format,
+                    currentVersion!!.trim(),
+                    currentVersionReleaseDate?.trim(),
+                    StringResource(
+                        context,
+                        "${currentVersion}.${readme.reference.extension}",
+                        content.substring(previousIndex, it.range.first)
+                    )
+                )
+            }
+
+            currentVersion = it.groupValues[versionRegexGroup]
+            currentVersionReleaseDate = it.groupValues[releaseDateRegexGroup]
+            previousIndex = it.range.last + 1
+        }
+
+        changelogVersions += ChangelogVersion(
+            context,
+            format,
+            currentVersion!!.trim(),
+            currentVersionReleaseDate?.trim(),
+            StringResource(
+                context,
+                "${currentVersion}.${readme.reference.extension}",
+                content.substring(previousIndex)
+            )
+        )
+
+        return changelogVersions
+    }
+}
diff --git a/plugins/OrchidChangelog/src/main/kotlin/com/eden/orchid/changelog/model/ChangelogVersion.kt b/plugins/OrchidChangelog/src/main/kotlin/com/eden/orchid/changelog/model/ChangelogVersion.kt
index 853eb7fa82..836d22911e 100644
--- a/plugins/OrchidChangelog/src/main/kotlin/com/eden/orchid/changelog/model/ChangelogVersion.kt
+++ b/plugins/OrchidChangelog/src/main/kotlin/com/eden/orchid/changelog/model/ChangelogVersion.kt
@@ -16,16 +16,24 @@ import org.json.JSONObject
 @Archetype(value = ConfigArchetype::class, key = "${ChangelogGenerator.GENERATOR_KEY}.allVersions")
 class ChangelogVersion(
     context: OrchidContext,
-    val versionFormat: String,
-    val versionFilename: String,
-    val resource: OrchidResource
+    private val versionFormat: String,
+    private val versionName: String,
+    private val versionReleaseDate: String?,
+    private val resource: OrchidResource
 ) : OptionsHolder {
 
     @Option
     @Description("The name of the version")
-    var version: String = versionFilename
+    var version: String = versionName
         get() {
-            return if (!EdenUtils.isEmpty(field)) field else versionFilename
+            return if (!EdenUtils.isEmpty(field)) field else versionName
+        }
+
+    @Option
+    @Description("The release date of this version")
+    var releaseDate: String? = versionReleaseDate
+        get() {
+            return if (!EdenUtils.isEmpty(field)) field else versionReleaseDate
         }
 
     @Option
diff --git a/plugins/OrchidChangelog/src/main/resources/templates/components/changelog.peb b/plugins/OrchidChangelog/src/main/resources/templates/components/changelog.peb
index f28b248794..fd6a00edd5 100644
--- a/plugins/OrchidChangelog/src/main/resources/templates/components/changelog.peb
+++ b/plugins/OrchidChangelog/src/main/resources/templates/components/changelog.peb
@@ -2,7 +2,7 @@
 {% for version in component.model.versions %}
 {# @pebvariable name="version" type="com.eden.orchid.changelog.model.ChangelogVersion" #}
 <details id="{{ version.version }}" {% if loop.first %}open{% endif %}>
-  <summary>{{ version.version }}</summary>
+  <summary>{{ version.version }} {% if version.releaseDate is not empty %} - {{ version.releaseDate }}{% endif %}</summary>
   {{ version.content | raw }}
 </details>
 {% endfor %}
diff --git a/plugins/OrchidChangelog/src/test/kotlin/com/eden/orchid/changelog/ChangelogGeneratorTest.kt b/plugins/OrchidChangelog/src/test/kotlin/com/eden/orchid/changelog/ChangelogGeneratorTest.kt
new file mode 100644
index 0000000000..32b539ae61
--- /dev/null
+++ b/plugins/OrchidChangelog/src/test/kotlin/com/eden/orchid/changelog/ChangelogGeneratorTest.kt
@@ -0,0 +1,532 @@
+package com.eden.orchid.changelog
+
+import com.eden.orchid.impl.generators.HomepageGenerator
+import com.eden.orchid.strikt.htmlBodyMatches
+import com.eden.orchid.strikt.pageWasRendered
+import com.eden.orchid.strikt.printResults
+import com.eden.orchid.strikt.summary
+import com.eden.orchid.testhelpers.OrchidIntegrationTest
+import com.eden.orchid.testhelpers.withGenerator
+import kotlinx.html.a
+import kotlinx.html.details
+import kotlinx.html.div
+import kotlinx.html.h1
+import kotlinx.html.id
+import kotlinx.html.li
+import kotlinx.html.ul
+import org.json.JSONArray
+import org.json.JSONObject
+import org.junit.jupiter.api.Disabled
+import org.junit.jupiter.api.DisplayName
+import org.junit.jupiter.api.Test
+import strikt.api.expectThat
+import strikt.assertions.all
+import strikt.assertions.containsExactlyInAnyOrder
+import strikt.assertions.hasSize
+import strikt.assertions.isA
+import strikt.assertions.isTrue
+import strikt.assertions.map
+
+class ChangelogGeneratorTest : OrchidIntegrationTest(ChangelogModule(), withGenerator<HomepageGenerator>()) {
+
+    @Test
+    @DisplayName("Test Changelog Generator using default settings (directory-based)")
+    fun test01() {
+        resource(
+            "homepage.md",
+            "",
+            """
+            |{
+            |    "components": [
+            |        {"type": "changelog"} 
+            |    ]
+            |}
+            """.trimMargin()
+        )
+        resource(
+            "changelog/0.1.0.md",
+            "# 0.1.0"
+        )
+        resource(
+            "changelog/0.2.0.md",
+            "# 0.2.0"
+        )
+        resource(
+            "changelog/0.3.0.md",
+            "# 0.3.0"
+        )
+        resource(
+            "changelog/1.0.0.md",
+            "# 1.0.0",
+            """
+            |{
+            |    "releaseDate": "2019-10-1"
+            |}
+            """.trimMargin()
+        )
+        resource(
+            "changelog/1.1.0.md",
+            "# 1.1.0",
+            """
+            |{
+            |    "releaseDate": "2019-11-1"
+            |}
+            """.trimMargin()
+        )
+
+        expectThat(execute())
+            .pageWasRendered("/index.html") {
+                htmlBodyMatches {
+                    div("component component-changelog component-order-0") {
+                        details {
+                            id = "1.1.0"
+                            open = true
+                            summary { +"1.1.0 - 2019-11-1" }
+
+                            h1 {
+                                id = "110"
+                                a(href = "#110", classes = "anchor") { id = "110" }
+                                +"1.1.0"
+                            }
+                        }
+
+                        details {
+                            id = "1.0.0"
+                            summary { +"1.0.0 - 2019-10-1" }
+
+                            h1 {
+                                id = "100"
+                                a(href = "#100", classes = "anchor") { id = "100" }
+                                +"1.0.0"
+                            }
+                        }
+                        details {
+                            id = "0.3.0"
+                            summary { +"0.3.0" }
+
+                            h1 {
+                                id = "030"
+                                a(href = "#030", classes = "anchor") { id = "030" }
+                                +"0.3.0"
+                            }
+                        }
+                        details {
+                            id = "0.2.0"
+                            summary { +"0.2.0" }
+
+                            h1 {
+                                id = "020"
+                                a(href = "#020", classes = "anchor") { id = "020" }
+                                +"0.2.0"
+                            }
+                        }
+                        details {
+                            id = "0.1.0"
+                            summary { +"0.1.0" }
+
+                            h1 {
+                                id = "010"
+                                a(href = "#010", classes = "anchor") { id = "010" }
+                                +"0.1.0"
+                            }
+                        }
+                    }
+                }
+            }
+            .pageWasRendered("/meta/versions.json") {
+                get { JSONArray(content) }
+                    .all {
+                        this.isA<JSONObject>()
+                    }
+                    .map { (it as JSONObject).getString("version") }
+                    .containsExactlyInAnyOrder("0.1.0", "1.0.0")
+            }
+    }
+
+    @Test
+    @DisplayName("Test Changelog Generator using customizing Generator with different base directory (directory-based)")
+    fun test02() {
+        configObject(
+            "changelog",
+            """
+            |{
+            |    "baseDir": "otherChangelogDir"
+            |}
+            """.trimMargin()
+        )
+        resource(
+            "homepage.md",
+            "",
+            """
+            |{
+            |    "components": [ 
+            |        {"type": "changelog"} 
+            |    ]
+            |}
+            """.trimMargin()
+        )
+        resource(
+            "otherChangelogDir/0.1.0.md",
+            "# 0.1.0"
+        )
+        resource(
+            "otherChangelogDir/0.2.0.md",
+            "# 0.2.0"
+        )
+        resource(
+            "otherChangelogDir/0.3.0.md",
+            "# 0.3.0"
+        )
+        resource(
+            "otherChangelogDir/1.0.0.md",
+            "# 1.0.0"
+        )
+        resource(
+            "otherChangelogDir/1.1.0.md",
+            "# 1.1.0"
+        )
+
+        expectThat(execute())
+            .pageWasRendered("/index.html") {
+                htmlBodyMatches {
+                    div("component component-changelog component-order-0") {
+                        details {
+                            id = "1.1.0"
+                            open = true
+                            summary { +"1.1.0" }
+
+                            h1 {
+                                id = "110"
+                                a(href = "#110", classes = "anchor") { id = "110" }
+                                +"1.1.0"
+                            }
+                        }
+
+                        details {
+                            id = "1.0.0"
+                            summary { +"1.0.0" }
+
+                            h1 {
+                                id = "100"
+                                a(href = "#100", classes = "anchor") { id = "100" }
+                                +"1.0.0"
+                            }
+                        }
+                        details {
+                            id = "0.3.0"
+                            summary { +"0.3.0" }
+
+                            h1 {
+                                id = "030"
+                                a(href = "#030", classes = "anchor") { id = "030" }
+                                +"0.3.0"
+                            }
+                        }
+                        details {
+                            id = "0.2.0"
+                            summary { +"0.2.0" }
+
+                            h1 {
+                                id = "020"
+                                a(href = "#020", classes = "anchor") { id = "020" }
+                                +"0.2.0"
+                            }
+                        }
+                        details {
+                            id = "0.1.0"
+                            summary { +"0.1.0" }
+
+                            h1 {
+                                id = "010"
+                                a(href = "#010", classes = "anchor") { id = "010" }
+                                +"0.1.0"
+                            }
+                        }
+                    }
+                }
+            }
+            .pageWasRendered("/meta/versions.json") {
+                get { JSONArray(content) }
+                    .all {
+                        this.isA<JSONObject>()
+                    }
+                    .map { (it as JSONObject).getString("version") }
+                    .containsExactlyInAnyOrder("0.1.0", "1.0.0")
+            }
+    }
+
+    @Test
+    @DisplayName("Test Changelog Generator customizing Adapter with different base directory (directory-based)")
+    fun test03() {
+        configObject(
+            "changelog",
+            """
+            |{
+            |    "adapter": {
+            |        "type": "directory",
+            |        "baseDir": "otherChangelogDir"
+            |    }
+            |}
+            """.trimMargin()
+        )
+        resource(
+            "homepage.md",
+            "",
+            """
+            |{
+            |    "components": [ 
+            |        {"type": "changelog"} 
+            |    ]
+            |}
+            """.trimMargin()
+        )
+        resource(
+            "otherChangelogDir/0.1.0.md",
+            """
+            |# 0.1.0
+            |
+            |- Initial release
+            """.trimMargin()
+        )
+        resource(
+            "otherChangelogDir/0.2.0.md",
+            "# 0.2.0"
+        )
+        resource(
+            "otherChangelogDir/0.3.0.md",
+            "# 0.3.0"
+        )
+        resource(
+            "otherChangelogDir/1.0.0.md",
+            "# 1.0.0"
+        )
+        resource(
+            "otherChangelogDir/1.1.0.md",
+            "# 1.1.0"
+        )
+
+        expectThat(execute())
+            .pageWasRendered("/index.html") {
+                htmlBodyMatches {
+                    div("component component-changelog component-order-0") {
+                        details {
+                            id = "1.1.0"
+                            open = true
+                            summary { +"1.1.0" }
+
+                            h1 {
+                                id = "110"
+                                a(href = "#110", classes = "anchor") { id = "110" }
+                                +"1.1.0"
+                            }
+                        }
+
+                        details {
+                            id = "1.0.0"
+                            summary { +"1.0.0" }
+
+                            h1 {
+                                id = "100"
+                                a(href = "#100", classes = "anchor") { id = "100" }
+                                +"1.0.0"
+                            }
+                        }
+                        details {
+                            id = "0.3.0"
+                            summary { +"0.3.0" }
+
+                            h1 {
+                                id = "030"
+                                a(href = "#030", classes = "anchor") { id = "030" }
+                                +"0.3.0"
+                            }
+                        }
+                        details {
+                            id = "0.2.0"
+                            summary { +"0.2.0" }
+
+                            h1 {
+                                id = "020"
+                                a(href = "#020", classes = "anchor") { id = "020" }
+                                +"0.2.0"
+                            }
+                        }
+                        details {
+                            id = "0.1.0"
+                            summary { +"0.1.0" }
+
+                            h1 {
+                                id = "010"
+                                a(href = "#010", classes = "anchor") { id = "010" }
+                                +"0.1.0"
+                            }
+                            ul {
+                                li {
+                                    +"Initial release"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            .pageWasRendered("/meta/versions.json") {
+                get { JSONArray(content) }
+                    .all {
+                        this.isA<JSONObject>()
+                    }
+                    .map { (it as JSONObject).getString("version") }
+                    .containsExactlyInAnyOrder("0.1.0", "1.0.0")
+            }
+    }
+
+    @Test
+    @DisplayName("Test Changelog Generator using default settings (file-based, from resources)")
+    fun test04() {
+        configObject(
+            "changelog",
+            """
+            |{
+            |    "adapter": {
+            |        "type": "file"
+            |    }
+            |}
+            """.trimMargin()
+        )
+        resource(
+            "homepage.md",
+            "",
+            """
+            |{
+            |    "components": [ 
+            |        {"type": "changelog"} 
+            |    ]
+            |}
+            """.trimMargin()
+        )
+        resource(
+            "CHANGELOG.md",
+            """
+            |# 0.1.0
+            |
+            |- Initial release (from resources)
+            |
+            |# 0.2.0
+            |# 0.3.0
+            |# 1.0.0 / 2019-10-1
+            |# 1.1.0 - 2019-11-1
+            """.trimMargin()
+        )
+
+        expectThat(execute())
+            .pageWasRendered("/index.html") {
+                htmlBodyMatches {
+                    div("component component-changelog component-order-0") {
+                        details {
+                            id = "1.1.0"
+                            open = true
+                            summary { +"1.1.0 - 2019-11-1" }
+                        }
+                        details {
+                            id = "1.0.0"
+                            summary { +"1.0.0 - 2019-10-1" }
+                        }
+                        details {
+                            id = "0.3.0"
+                            summary { +"0.3.0" }
+                        }
+                        details {
+                            id = "0.2.0"
+                            summary { +"0.2.0" }
+                        }
+                        details {
+                            id = "0.1.0"
+                            summary { +"0.1.0" }
+                            ul {
+                                li {
+                                    +"Initial release (from resources)"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            .pageWasRendered("/meta/versions.json") {
+                get { JSONArray(content) }
+                    .all {
+                        this.isA<JSONObject>()
+                    }
+                    .map { (it as JSONObject).getString("version") }
+                    .containsExactlyInAnyOrder("0.1.0", "1.0.0")
+            }
+    }
+
+    @Test
+    @DisplayName("Test Changelog Generator using default settings (file-based, from file)")
+    fun test05() {
+        configObject(
+            "changelog",
+            """
+            |{
+            |    "adapter": {
+            |        "type": "file",
+            |        "baseDir": "./src/test/resources",
+            |        "filename": "CHANGES"
+            |    }
+            |}
+            """.trimMargin()
+        )
+        resource(
+            "homepage.md",
+            "",
+            """
+            |{
+            |    "components": [ 
+            |        {"type": "changelog"} 
+            |    ]
+            |}
+            """.trimMargin()
+        )
+
+        expectThat(execute())
+            .pageWasRendered("/index.html") {
+                htmlBodyMatches {
+                    div("component component-changelog component-order-0") {
+                        details {
+                            id = "1.1.0"
+                            open = true
+                            summary { +"1.1.0 - 2019-11-1" }
+                        }
+                        details {
+                            id = "1.0.0"
+                            summary { +"1.0.0 - 2019-10-1" }
+                        }
+                        details {
+                            id = "0.3.0"
+                            summary { +"0.3.0" }
+                        }
+                        details {
+                            id = "0.2.0"
+                            summary { +"0.2.0" }
+                        }
+                        details {
+                            id = "0.1.0"
+                            summary { +"0.1.0" }
+                            ul {
+                                li {
+                                    +"Initial release (from file)"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            .pageWasRendered("/meta/versions.json") {
+                get { JSONArray(content) }
+                    .all {
+                        this.isA<JSONObject>()
+                    }
+                    .map { (it as JSONObject).getString("version") }
+                    .containsExactlyInAnyOrder("0.1.0", "1.0.0")
+            }
+    }
+}
diff --git a/plugins/OrchidChangelog/src/test/resources/CHANGES.md b/plugins/OrchidChangelog/src/test/resources/CHANGES.md
new file mode 100644
index 0000000000..1785102e42
--- /dev/null
+++ b/plugins/OrchidChangelog/src/test/resources/CHANGES.md
@@ -0,0 +1,11 @@
+# 0.1.0
+
+- Initial release (from file)
+
+# 0.2.0
+
+# 0.3.0
+
+# 1.0.0 / 2019-10-1
+
+# 1.1.0 - 2019-11-1
diff --git a/plugins/OrchidSearch/src/main/kotlin/com/eden/orchid/search/SearchIndexGenerator.kt b/plugins/OrchidSearch/src/main/kotlin/com/eden/orchid/search/SearchIndexGenerator.kt
index 95a7319d3f..baf8e6c922 100644
--- a/plugins/OrchidSearch/src/main/kotlin/com/eden/orchid/search/SearchIndexGenerator.kt
+++ b/plugins/OrchidSearch/src/main/kotlin/com/eden/orchid/search/SearchIndexGenerator.kt
@@ -6,6 +6,7 @@ import com.eden.orchid.api.generators.OrchidCollection
 import com.eden.orchid.api.generators.OrchidGenerator
 import com.eden.orchid.api.generators.emptyModel
 import com.eden.orchid.api.indexing.OrchidIndex
+import com.eden.orchid.api.options.annotations.BooleanDefault
 import com.eden.orchid.api.options.annotations.Description
 import com.eden.orchid.api.options.annotations.Option
 import com.eden.orchid.api.resources.resource.JsonResource
@@ -28,13 +29,20 @@ class SearchIndexGenerator : OrchidGenerator<OrchidGenerator.Model>(GENERATOR_KE
     @Description("A list of generator keys whose pages are ignored by this taxonomy.")
     lateinit var excludeFrom: Array<String>
 
+    @Option
+    @BooleanDefault(false)
+    @Description("Whether to create a JSON file for each page in your site, with a path of the page plus .json")
+    var createSinglePageIndexFiles: Boolean = false
+
     override fun startIndexing(context: OrchidContext): Model {
         return emptyModel()
     }
 
     override fun startGeneration(context: OrchidContext, model: Model) {
         generateSiteIndexFiles(context)
-        generatePageIndexFiles(context)
+        if(createSinglePageIndexFiles) {
+            generatePageIndexFiles(context)
+        }
     }
 
     private fun generateSiteIndexFiles(context: OrchidContext) {
diff --git a/themes/OrchidCopper/src/main/kotlin/com/eden/orchid/copper/CopperTheme.kt b/themes/OrchidCopper/src/main/kotlin/com/eden/orchid/copper/CopperTheme.kt
index 4220ec563d..e264433f80 100644
--- a/themes/OrchidCopper/src/main/kotlin/com/eden/orchid/copper/CopperTheme.kt
+++ b/themes/OrchidCopper/src/main/kotlin/com/eden/orchid/copper/CopperTheme.kt
@@ -7,6 +7,7 @@ import com.eden.orchid.api.options.annotations.Description
 import com.eden.orchid.api.options.annotations.Option
 import com.eden.orchid.api.options.annotations.StringDefault
 import com.eden.orchid.api.theme.Theme
+import com.eden.orchid.api.theme.menus.OrchidMenu
 import com.eden.orchid.api.theme.models.Social
 import com.eden.orchid.impl.relations.PageRelation
 import javax.inject.Inject
@@ -202,13 +203,22 @@ class CopperSidebarLayoutConfig : OptionsHolder {
     var wrapPageInBox: Boolean = true
 
     @Option @BooleanDefault(true)
-    var wrapTitleInBox: Boolean = true
+    var includeTitle: Boolean = true
 
     @Option @BooleanDefault(true)
-    var includeTitle: Boolean = true
+    var wrapTitleInBox: Boolean = true
 
     @Option @BooleanDefault(true)
     var includeBreadcrumbs: Boolean = true
+
+    @Option @BooleanDefault(true)
+    var wrapBreadcrumbsInBox: Boolean = true
+
+    @Option @BooleanDefault(true)
+    var includePageContentsMenu: Boolean = true
+
+    @Option
+    lateinit var pageContentsMenu: OrchidMenu
 }
 
 class CopperHomepageLayoutConfig : OptionsHolder {
diff --git a/themes/OrchidCopper/src/main/resources/templates/components/changelog.peb b/themes/OrchidCopper/src/main/resources/templates/components/changelog.peb
index 104da4636a..8473661811 100644
--- a/themes/OrchidCopper/src/main/resources/templates/components/changelog.peb
+++ b/themes/OrchidCopper/src/main/resources/templates/components/changelog.peb
@@ -5,7 +5,7 @@
 {% for version in component.model.versions %}
   <article class="accordion {% if loop.first %}is-active{% endif %}">
     <div class="accordion-header toggle">
-      <p>{{ version.version }} {% if loop.first %}(latest){% endif %}</p>
+      <p>{{ version.version }} {% if version.releaseDate is not empty %} - {{ version.releaseDate }}{% endif %}{% if loop.first %}(latest){% endif %}</p>
     </div>
     <div class="accordion-body">
       <div class="accordion-content content is-medium-tablet is-large-fullhd">
diff --git a/themes/OrchidCopper/src/main/resources/templates/includes/copper/tile_menu.peb b/themes/OrchidCopper/src/main/resources/templates/includes/copper/tile_menu.peb
index 32c0d85b21..764354e61e 100644
--- a/themes/OrchidCopper/src/main/resources/templates/includes/copper/tile_menu.peb
+++ b/themes/OrchidCopper/src/main/resources/templates/includes/copper/tile_menu.peb
@@ -25,8 +25,8 @@
 </div>
 
 {% macro tileContent(tileChild) %}
-{% set title = tileChild.title %}
-{% set subtitle = tileChild.page.description %}
+{% set title = tileChild.page.title | default(tileChild.title) %}
+{% set subtitle = tileChild.page.description |default(tileChild.subtitle) %}
 
 {% if tileChild.page is not null %}
     {% set excerpt = tileChild.page | excerpt %}
@@ -34,17 +34,6 @@
     {% set excerpt = '' %}
 {% endif %}
 
-{% if title is empty %}
-    {% set title = tileChild.linkedPage.title %}
-    {% if subtitle is empty %}
-        {% set subtitle = tileChild.linkedPage.description %}
-    {% endif %}
-{% else %}
-    {% if subtitle is empty %}
-        {% set subtitle = tileChild.linkedPage.title %}
-    {% endif %}
-{% endif %}
-
 <p class="title"><span>{{ title }}</span></p>
 <p class="subtitle">{{ subtitle | raw }}</p>
 {% if excerpt is not empty %}
diff --git a/themes/OrchidCopper/src/main/resources/templates/layouts/base/sidebarBase.peb b/themes/OrchidCopper/src/main/resources/templates/layouts/base/sidebarBase.peb
index 4505c9d22b..55ccf926cf 100644
--- a/themes/OrchidCopper/src/main/resources/templates/layouts/base/sidebarBase.peb
+++ b/themes/OrchidCopper/src/main/resources/templates/layouts/base/sidebarBase.peb
@@ -12,10 +12,10 @@
 {% endblock %}
   <div class="column is-two-thirds-desktop is-three-quarters-widescreen is-four-fifths-fullhd is-paddingless column-main-right">
   {% include 'includes/copper/navbar' %}
-    <div class="textured">
+    <div class="textured container" style="width: 100%;">
     {% if layoutConfig.includeBreadcrumbs %}
     {% block breadcrumbs %}
-    {% if layoutConfig.wrapPageInBox %}
+    {% if layoutConfig.wrapPageInBox or layoutConfig.wrapBreadcrumbsInBox %}
       <div class="box">
       {% breadcrumbs %}
       </div>
diff --git a/themes/OrchidCopper/src/main/resources/templates/macros/listMenu.peb b/themes/OrchidCopper/src/main/resources/templates/macros/listMenu.peb
index b74e4f3f51..92d129a56f 100644
--- a/themes/OrchidCopper/src/main/resources/templates/macros/listMenu.peb
+++ b/themes/OrchidCopper/src/main/resources/templates/macros/listMenu.peb
@@ -1,5 +1,5 @@
-{% macro _listMenu(page, menu) %}
-{% for menuItem in page.menu.getMenuItems(page) %}
+{%- macro _listMenu(page, menu) -%}
+{% for menuItem in menu.getMenuItems(page) %}
   {# @pebvariable name="menuItem" type="com.eden.orchid.api.theme.menus.MenuItem" #}
   {% if menuItem.hasChildren() %}
     {{ _menuItemWithChildren(page, menuItem) }}
@@ -31,11 +31,14 @@
 <li>
   <!-- page={{ page.link }} {{ page.hashCode() }} -->
   <!-- menuItem.page={{ menuItem.page.link }} {{ menuItem.page.hashCode() }} -->
-  <a href="{{ menuItem.link }}" class="{{ menuItem.isActivePage(page) ? 'is-active' : '' }}">{{ menuItem.title }}</a>
+  <a href="{{ menuItem.link }}" class="{{ menuItem.isActivePage(page) ? 'is-active' : '' }}">
+  {% if menuItem.icon is not empty %}<i class="{{ menuItem.icon }}"></i>{% endif %}
+  {{ menuItem.title }}
+  </a>
 </li>
 {% endif %}
 {% endmacro %}
 
 {% macro _menuItemSeparator(page, menuItem) %}
 <p class="menu-label">{{ menuItem.title }}</p>
-{% endmacro %}
+{%- endmacro -%}