diff --git a/cinera/cinera.c b/cinera/cinera.c
index 2bf26b2..ecfcb6b 100644
--- a/cinera/cinera.c
+++ b/cinera/cinera.c
@@ -1,7 +1,7 @@
 #if 0
 ctime -begin ${0%.*}.ctm
 gcc -g -fsanitize=address -Wall -std=c99 -pipe $0 -o ${0%.*} hmml.a -lcurl
-#gcc -Wall -std=c99 -pipe $0 -o ${0%.*} hmml.a -lcurl
+#gcc -O2 -Wall -std=c99 -pipe $0 -o ${0%.*} hmml.a -lcurl
 ctime -end ${0%.*}.ctm
 exit
 #endif
@@ -14,7 +14,7 @@ typedef struct
 version CINERA_APP_VERSION = {
     .Major = 0,
     .Minor = 5,
-    .Patch = 16
+    .Patch = 17
 };
 
 // TODO(matt): Copy in the DB 3 stuff from cinera_working.c
@@ -69,9 +69,7 @@ enum
 
 enum
 {
-    MODE_BARE = 1 << 0,
-    MODE_INTEGRATE = 1 << 1,
-    MODE_ONESHOT = 1 << 2
+    MODE_ONESHOT = 1 << 0,
 } modes;
 
 enum
@@ -95,35 +93,6 @@ enum
     RC_SUCCESS
 } returns;
 
-typedef struct
-{
-    int   Edition;
-    int   LogLevel;
-    int   Mode;
-    int   UpdateInterval;
-    bool  ForceIntegration;
-    char *RootDir; // Absolute
-    char *RootURL;
-    char *CSSDir; // Relative to RootDir and RootURL
-    char *ImagesDir; // Relative to RootDir and RootURL
-    char *JSDir; // Relative to RootDir and RootURL
-    char *ProjectID;
-    char *BaseDir; // Absolute
-    char *BaseURL;
-    char *IndexLocation; // Relative to BaseDir and BaseURL
-    char *PlayerLocation; // Relative to BaseDir and BaseURL
-    char *TemplateIndexLocation; // Relative to RootDir and RootURL
-    char *TemplatePlayerLocation; // Relative to RootDir and RootURL
-    char *Theme;
-    char  CacheDir[256];
-    char *DefaultMedium;
-    char *OutLocation;
-    char *OutIntegratedLocation;
-    char *ProjectDir;
-    char *PlayerURLPrefix; /* NOTE(matt): This will become a full blown customisable output URL.
-                                    For now it simply replaces the ProjectID */
-} config;
-
 typedef struct
 {
     void *Location;
@@ -132,10 +101,6 @@ typedef struct
     int  Size;
 } arena;
 
-// NOTE(matt): Globals
-config Config;
-arena MemoryArena;
-
 typedef struct
 {
     char *Location;
@@ -152,6 +117,23 @@ typedef struct
     int    FileSize;
 } file_buffer;
 
+typedef struct
+{
+    buffer IncludesIndex;
+    buffer Search;
+    buffer Index; // NOTE(matt): This buffer is malloc'd separately, rather than claimed from the memory_arena
+    buffer ScriptIndex;
+    buffer IncludesPlayer;
+    buffer Menus;
+    buffer Player;
+    buffer ScriptPlayer;
+    char ProjectName[32];
+    char Title[256];
+    char URLIndex[2048];
+    char URLPlayer[2048];
+    char VideoID[16];
+} buffers;
+
 enum
 {
     // Contents Page
@@ -210,20 +192,48 @@ typedef struct
 
 typedef struct
 {
-    buffer IncludesIndex;
-    buffer Search;
-    buffer Index; // NOTE(matt): This buffer is malloc'd separately, rather than claimed from the memory_arena
-    buffer ScriptIndex;
-    buffer IncludesPlayer;
-    buffer Menus;
-    buffer Player;
-    buffer ScriptPlayer;
-    char ProjectName[32];
-    char Title[256];
-    char URLIndex[2048];
-    char URLPlayer[2048];
-    char VideoID[16];
-} buffers;
+    // Universal
+    char  CacheDir[256];
+    int   Edition;
+    int   LogLevel;
+    int   Mode;
+    int   UpdateInterval;
+    bool  ForceIntegration;
+
+    // Advisedly universal, although could be per-project
+    char *RootDir; // Absolute
+    char *RootURL;
+    char *CSSDir; // Relative to Root{Dir,URL}
+    char *ImagesDir; // Relative to Root{Dir,URL}
+    char *JSDir; // Relative to Root{Dir,URL}
+
+    // Per Project
+    char *ProjectID;
+    char *Theme;
+    char *DefaultMedium;
+
+    // Per Project - Input
+    char *ProjectDir; // Absolute
+    char *TemplatesDir; // Absolute
+    char *TemplateIndexLocation; // Relative to TemplatesDir ???
+    char *TemplatePlayerLocation; // Relative to TemplatesDir ???
+
+    // Per Project - Output
+    char *BaseDir; // Absolute
+    char *BaseURL;
+    char *IndexLocation; // Relative to Base{Dir,URL}
+    char *PlayerLocation; // Relative to Base{Dir,URL}
+    char *PlayerURLPrefix; /* NOTE(matt): This will become a full blown customisable output URL.
+                                    For now it simply replaces the ProjectID */
+
+    // Single Edition - Output
+    char *OutLocation;
+    char *OutIntegratedLocation;
+} config;
+
+// NOTE(matt): Globals
+config Config = {};
+arena MemoryArena;
 
 // TODO(matt): Consider putting the ref_info and quote_info into linked lists on the heap, just to avoid all the hardcoded sizes
 
@@ -611,7 +621,7 @@ LogUsage(buffer *Buffer)
     FILE *LogFile;
     if(!(LogFile = fopen(LogPath, "a+")))
     {
-        MakeDir(CacheDir);
+        MakeDir(Config.CacheDir);
         if(!(LogFile = fopen(LogPath, "a+")))
         {
             perror("LogUsage");
@@ -693,9 +703,9 @@ ClaimBuffer(buffer *Buffer, char *ID, int Size)
     *Buffer->Location = '\0';
     Buffer->Ptr = Buffer->Location;
 #if DEBUG
-    float PercentageUsed = (float)(MemoryArena->Ptr - MemoryArena->Location) / MemoryArena->Size * 100;
+    float PercentageUsed = (float)(MemoryArena.Ptr - MemoryArena.Location) / MemoryArena.Size * 100;
     printf("  ClaimBuffer(%s): %d\n"
-           "    Total ClaimedMemory: %ld (%.2f%%, leaving %ld free)\n\n", Buffer->ID, Buffer->Size, MemoryArena->Ptr - MemoryArena->Location, PercentageUsed, MemoryArena->Size - (MemoryArena->Ptr - MemoryArena->Location));
+           "    Total ClaimedMemory: %ld (%.2f%%, leaving %ld free)\n\n", Buffer->ID, Buffer->Size, MemoryArena.Ptr - MemoryArena.Location, PercentageUsed, MemoryArena.Size - (MemoryArena.Ptr - MemoryArena.Location));
 #endif
     return RC_SUCCESS;
 }
@@ -741,20 +751,72 @@ void RewindBuffer(buffer *Buffer)
     Buffer->Ptr = Buffer->Location;
 }
 
-int
-ClaimTemplate(template **Template, char *Location)
+enum
 {
-    *Template = (template *)MemoryArena.Ptr;
-    (*Template)->Buffer.Location = MemoryArena.Ptr + sizeof(template);
-    (*Template)->Buffer.Ptr = (*Template)->Buffer.Location;
-    (*Template)->Buffer.ID = Location;
-    if(Location[0] != '/')
+    TEMPLATE_INDEX,
+    TEMPLATE_PLAYER,
+    TEMPLATE_BESPOKE
+} templates;
+
+void
+ConstructTemplatePath(template *Template, int TemplateType)
+{
+    // TODO(matt): Consider just straight up having the TemplateDir relative to the ProjectDir...
+    if(Template->Metadata.Filename[0] != '/')
     {
-        CopyString((*Template)->Metadata.Filename, "%s/%s", Config.RootDir, Location);
+        char Temp[256];
+        CopyString(Temp, Template->Metadata.Filename);
+        char *Ptr = Template->Metadata.Filename;
+        if(TemplateType == TEMPLATE_BESPOKE)
+        {
+            Ptr += CopyString(Ptr, "%s/", Config.ProjectDir);
+        }
+        else
+        {
+            Ptr += CopyString(Ptr, "%s/", Config.TemplatesDir);
+        }
+        CopyString(Ptr, "%s", Temp);
     }
-    else
+}
+
+void
+Clear(char *String, int Size)
+{
+    for(int i = 0; i < Size; ++i)
     {
-        CopyString((*Template)->Metadata.Filename, "%s", Location);
+        String[i] = 0;
+    }
+}
+
+int
+InitTemplate(template **Template)
+{
+    if(MemoryArena.Ptr - MemoryArena.Location + sizeof(template) > MemoryArena.Size)
+    {
+        return RC_ARENA_FULL;
+    }
+    *Template = (template *)MemoryArena.Ptr;
+    Clear((*Template)->Metadata.Filename, 256); // NOTE(matt): template_metadata specifies Filename[256]
+    (*Template)->Metadata.Validity = 0;
+    (*Template)->Metadata.TagCount = 0;
+    for(int i = 0; i < 16; ++i) // NOTE(matt): template_metadata specifies Tag[16]
+    {
+        (*Template)->Metadata.Tag[i].Offset = 0;
+        (*Template)->Metadata.Tag[i].TagCode = 0;
+    }
+    MemoryArena.Ptr += sizeof(template);
+    return RC_SUCCESS;
+}
+
+int
+ClaimTemplate(template **Template, char *Location, int TemplateType)
+{
+    CopyString((*Template)->Metadata.Filename, Location);
+    ConstructTemplatePath((*Template), TemplateType);
+
+    if(TemplateType == TEMPLATE_BESPOKE)
+    {
+        fprintf(stderr, "\e[0;35mPacking\e[0m template: %s\n", (*Template)->Metadata.Filename);
     }
 
     FILE *File;
@@ -762,24 +824,30 @@ ClaimTemplate(template **Template, char *Location)
     {
         LogError(LOG_ERROR, "Unable to open template %s: %s", (*Template)->Metadata.Filename, strerror(errno));
         fprintf(stderr, "Unable to open template %s: %s\n", (*Template)->Metadata.Filename, strerror(errno));
+        Clear((*Template)->Metadata.Filename, 256); // NOTE(matt): template_metadata specifies Filename[256]
         return RC_ERROR_FILE;
     }
     fseek(File, 0, SEEK_END);
     (*Template)->Buffer.Size = ftell(File);
-    if(MemoryArena.Ptr - MemoryArena.Location + sizeof(template) + (*Template)->Buffer.Size > MemoryArena.Size)
+    if(MemoryArena.Ptr - MemoryArena.Location + (*Template)->Buffer.Size > MemoryArena.Size)
     {
+        Clear((*Template)->Metadata.Filename, 256); // NOTE(matt): template_metadata specifies Filename[256]
         return RC_ARENA_FULL;
     }
 
-    MemoryArena.Ptr += sizeof(template) + (*Template)->Buffer.Size;
+    (*Template)->Buffer.Location = MemoryArena.Ptr;
+    (*Template)->Buffer.Ptr = (*Template)->Buffer.Location;
+    (*Template)->Buffer.ID = (*Template)->Metadata.Filename;
 
     fseek(File, 0, SEEK_SET);
     fread((*Template)->Buffer.Location, (*Template)->Buffer.Size, 1, File);
     fclose(File);
 
+    MemoryArena.Ptr += (*Template)->Buffer.Size;
+
 #if DEBUG
-    printf("  ClaimTemplate(%s): %ld\n"
-           "    Total ClaimedMemory: %ld\n\n", (*Template)->Metadata.Filename, sizeof(template) + (*Template)->Buffer.Size, MemoryArena->Ptr - MemoryArena->Location);
+    printf("  ClaimTemplate(%s): %d\n"
+           "    Total ClaimedMemory: %ld\n\n", (*Template)->Metadata.Filename, (*Template)->Buffer.Size, MemoryArena.Ptr - MemoryArena.Location);
 #endif
     return RC_SUCCESS;
 }
@@ -787,7 +855,16 @@ ClaimTemplate(template **Template, char *Location)
 int
 DeclaimTemplate(template *Template)
 {
-    MemoryArena.Ptr -= (sizeof(template) + (*Template).Buffer.Size);
+    Clear(Template->Metadata.Filename, 256);
+    Template->Metadata.Validity = 0;
+    for(int i = 0; i < Template->Metadata.TagCount; ++i)
+    {
+        Template->Metadata.Tag[i].Offset = 0;
+        Template->Metadata.Tag[i].TagCode = 0;
+    }
+    Template->Metadata.TagCount = 0;
+    MemoryArena.Ptr -= (*Template).Buffer.Size;
+
 #if DEBUG
     printf("DeclaimTemplate(%s)\n"
            "    Total ClaimedMemory: %ld\n\n",
@@ -1678,72 +1755,110 @@ GenerateTopicColours(char *Topic)
 void
 PrintUsage(char *BinaryLocation, config *DefaultConfig)
 {
-    fprintf(stderr, "Usage: %s [option(s)] filename(s)\n"
+    fprintf(stderr,
+            "Usage: %s [option(s)] filename(s)\n"
             "\n"
             "Options:\n"
-            "    Paths: \n"
+            "    Paths: \e[1;30m(advisedly universal, but may be set per-(sub)project as required)\e[0m\n"
             "        -r <root directory>\n"
             "            Override default root directory (\"%s\")\n"
             "        -R <root URL>\n"
             "            Override default root URL (\"%s\")\n"
             "            \e[1;31mIMPORTANT\e[0m: -r and -R must correspond to the same location\n"
-            "        -c <CSS directory path>\n"
-            "            Override default CSS directory (\"%s\"), relative to root\n"
-            "        -i <images directory path>\n"
-            "            Override default images directory (\"%s\"), relative to root\n"
-            "        -j <JS directory path>\n"
-            "            Override default JS directory (\"%s\"), relative to root\n"
+            "            \e[1;30mUNSUPPORTED: If you move files from RootDir, the RootURL should\n"
+            "            correspond to the resulting location\e[0m\n"
             "\n"
+            "            -c <CSS directory path>\n"
+            "                Override default CSS directory (\"%s\"), relative to root\n"
+            "            -i <images directory path>\n"
+            "                Override default images directory (\"%s\"), relative to root\n"
+            "            -j <JS directory path>\n"
+            "                Override default JS directory (\"%s\"), relative to root\n"
+            "\n"
+            "    Project Settings:\n"
+            "        -p <project ID>\n"
+            "            Set the project ID, equal to the \"project\" field in the HMML files\n"
+            "            NOTE: Setting the project ID triggers PROJECT EDITION\n"
+            "        -m <default medium>\n"
+            "            Override default default medium (\"%s\")\n"
+            "            \e[1;30mKnown project defaults:\n",
+        BinaryLocation,
+        DefaultConfig->RootDir,
+        DefaultConfig->RootURL,
+
+        DefaultConfig->CSSDir,
+        DefaultConfig->ImagesDir,
+        DefaultConfig->JSDir,
+
+        DefaultConfig->DefaultMedium);
+
+    for(int ProjectIndex = 0; ProjectIndex < ArrayCount(ProjectInfo); ++ProjectIndex)
+    {
+        fprintf(stderr, "                %s:",
+                ProjectInfo[ProjectIndex].ProjectID);
+
+        // NOTE(matt): This kind of thing really needs to loop over the dudes once to find the longest one
+        for(int i = 11; i > StringLength(ProjectInfo[ProjectIndex].ProjectID); i -= 4)
+        {
+            fprintf(stderr, "\t");
+        }
+
+        fprintf(stderr, "%s\n",
+                ProjectInfo[ProjectIndex].Medium);
+    }
+
+    fprintf(stderr,
+            "\e[0m        -s <style>\n"
+            "            Set the style / theme, corresponding to a cinera__*.css file\n"
+            "            This is equal to the \"project\" field in the HMML files by default\n"
+            "        -q\n"
+            "            Quit after syncing with annotation files in project input directory\n"
+            "            \e[1;30mUNSUPPORTED: This is likely to be removed in the future\e[0m\n"
+            "\n"
+            "    Project Input Paths\n"
+            "        -d <annotations directory>\n"
+            "            Override default annotations directory (\"%s\")\n"
+            "        -t <templates directory>\n"
+            "            Override default templates directory (\"%s\")\n"
+            "\n"
+            "            -x <index template location>\n"
+            "                Set index template file path, either absolute or relative to\n"
+            "                template directory, and enable integration\n"
+            "            -y <player template location>\n"
+            "                Set player template file path, either absolute or relative\n"
+            "                to template directory, and enable integration\n"
+            "\n"
+            "    Project Output Paths\n"
             "        -b <base output directory>\n"
             "            Override project's default base output directory (\"%s\")\n"
             "        -B <base URL>\n"
             "            Override default base URL (\"%s\")\n"
-            "            NOTE: This must be set, if -n or -a are used\n"
-            "        -n <index location>\n"
-            "            Override default index location (\"%s\"), relative to base\n"
-            "        -a <player location>\n"
-            "            Override default player location (\"%s\"), relative to base\n"
+            "            NOTE: This must be set, if -n or -a are to be used\n"
             "\n"
-            "        -t <player template location>\n"
-            "            Override default player template location (\"%s\"), either\n"
-            "            absolute or relative to root, and enable integration\n"
-            "        -x <index template location>\n"
-            "            Override default index template location (\"%s\"), either\n"
-            "            absolute or relative to root, and enable integration\n"
+            "            -n <index location>\n"
+            "                Override default index location (\"%s\"), relative to base\n"
+            "            -a <player location>\n"
+            "                Override default player location (\"%s\"), relative to base\n"
+            "            NOTE: The PlayerURLPrefix is currently hardcoded in cinera.c but\n"
+            "                  will be configurable in the full configuration system\n"
             "\n"
-            "        -d <project directory>\n"
-            "            Override default project directory (\"%s\")\n"
+            "    Single Edition Output Path\n"
             "        -o <output location>\n"
-            "            Override default output player location for SINGLE_EDITION (\"%s\")\n"
+            "            Override default output player location (\"%s\")\n"
             "\n"
-            "    -p <project ID>\n"
-            "        Set the project ID, corresponding to the \"project\" field in the HMML files\n"
-            "    -q\n"
-            "        Quit after syncing with annotation files in project input directory\n"
-            "        (Only affects PROJECT edition)\n"
-            "    -s <style>\n"
-            "        Set the style / theme, corresponding to a cinera__*.css file\n"
-            "        This is equal to the \"project\" field in the HMML files by default\n"
-            "    -m <default medium>\n"
-            "        Override default default medium (\"%s\")\n"
             "    -f\n"
             "        Force integration with an incomplete template\n"
             "\n"
             "    -l <n>\n"
             "        Override default log level (%d), where n is from 0 (terse) to 7 (verbose)\n"
             "    -U <seconds>\n"
-            "        Override default update interval (\"%d\")\n"
+            "        Override default update interval (%d)\n"
             //"    -c config location\n"
             "    -v\n"
             "        display version and exit\n"
             "    -h\n"
             "        display this help\n"
             "\n"
-            "Environment Variables:\n"
-            "    CINERA_MODE\n"
-            "        =INTEGRATE\n"
-            "            Enable integration\n"
-            "\n"
             "Template:\n"
             "   A complete index template shall contain exactly one each of the following tags:\n"
             "       <!-- __CINERA_INCLUDES__ -->\n"
@@ -1762,13 +1877,24 @@ PrintUsage(char *BinaryLocation, config *DefaultConfig)
             "       <!-- __CINERA_PROJECT__ -->\n"
             "       <!-- __CINERA_TITLE__ -->\n"
             "       <!-- __CINERA_URL__ -->\n"
-            "           Only really usable if Base URL is set (-B)\n"
+            "           Only really usable if BaseURL is set \e[1;30m(-B)\e[0m\n"
             "       <!-- __CINERA_VIDEO_ID__ -->\n"
             "           Intended only for your player template\n"
             "\n"
             "HMML Specification:\n"
             "    https://git.handmade.network/Annotation-Pushers/Annotation-System/wikis/hmmlspec\n",
-        BinaryLocation, DefaultConfig->RootDir, DefaultConfig->RootURL, DefaultConfig->CSSDir, DefaultConfig->ImagesDir, DefaultConfig->JSDir, DefaultConfig->BaseDir, DefaultConfig->BaseURL, DefaultConfig->IndexLocation, DefaultConfig->PlayerLocation, DefaultConfig->TemplatePlayerLocation, DefaultConfig->TemplateIndexLocation, DefaultConfig->ProjectDir, DefaultConfig->OutLocation, DefaultConfig->DefaultMedium, DefaultConfig->LogLevel, DefaultConfig->UpdateInterval);
+
+        DefaultConfig->ProjectDir,
+        DefaultConfig->TemplatesDir,
+
+        DefaultConfig->BaseDir,
+        DefaultConfig->BaseURL,
+        DefaultConfig->IndexLocation,
+        DefaultConfig->PlayerLocation,
+
+        DefaultConfig->OutLocation,
+        DefaultConfig->LogLevel,
+        DefaultConfig->UpdateInterval);
 }
 
 void
@@ -1786,12 +1912,23 @@ DepartComment(buffer *Template)
 }
 
 int
-ValidateTemplate(buffer *Errors, template **Template, int PageType)
+ValidateTemplate(template **Template, char *Location, int TemplateType)
 {
-    if(ClaimTemplate(Template,
-                PageType == PAGE_INDEX ? Config.TemplateIndexLocation : Config.TemplatePlayerLocation) == RC_ARENA_FULL){ return RC_ARENA_FULL; };
+#if 1
+    int Return = ClaimTemplate(Template, Location, TemplateType);
+    switch(Return)
+    {
+        case RC_ARENA_FULL:
+        case RC_ERROR_FILE:
+            return Return;
+        case RC_SUCCESS:
+            break;
+    }
+#endif
+
+    buffer Errors;
+    if(ClaimBuffer(&Errors, "Errors", Kilobytes(1)) == RC_ARENA_FULL) { DeclaimTemplate(*Template); return RC_ARENA_FULL; };
 
-    RewindBuffer(Errors);
     bool HaveErrors = FALSE;
 
     bool FoundIncludes = FALSE;
@@ -1839,7 +1976,7 @@ Here:
                             case TAG_INCLUDES:
                                 if(!Config.ForceIntegration && FoundIncludes == TRUE)
                                 {
-                                    CopyStringToBuffer(Errors, "(*Template) contains more than one <!-- %s --> tag\n", Tags[i].Tag);
+                                    CopyStringToBuffer(&Errors, "Template contains more than one <!-- %s --> tag\n", Tags[i].Tag);
                                     HaveErrors = TRUE;
                                 }
                                 (*Template)->Metadata.Tag[(*Template)->Metadata.TagCount].Offset = CommentStart - Previous;
@@ -1852,7 +1989,7 @@ Here:
                             case TAG_MENUS:
                                 if(!Config.ForceIntegration && FoundMenus == TRUE)
                                 {
-                                    CopyStringToBuffer(Errors, "(*Template) contains more than one <!-- %s --> tag\n", Tags[i].Tag);
+                                    CopyStringToBuffer(&Errors, "Template contains more than one <!-- %s --> tag\n", Tags[i].Tag);
                                     HaveErrors = TRUE;
                                 }
                                 (*Template)->Metadata.Tag[(*Template)->Metadata.TagCount].Offset = CommentStart - Previous;
@@ -1865,7 +2002,7 @@ Here:
                             case TAG_PLAYER:
                                 if(!Config.ForceIntegration && FoundPlayer == TRUE)
                                 {
-                                    CopyStringToBuffer(Errors, "(*Template) contains more than one <!-- %s --> tag\n", Tags[i].Tag);
+                                    CopyStringToBuffer(&Errors, "Template contains more than one <!-- %s --> tag\n", Tags[i].Tag);
                                     HaveErrors = TRUE;
                                 }
                                 (*Template)->Metadata.Tag[(*Template)->Metadata.TagCount].Offset = CommentStart - Previous;
@@ -1878,12 +2015,12 @@ Here:
                             case TAG_SCRIPT:
                                 if(!Config.ForceIntegration && FoundPlayer == FALSE)
                                 {
-                                    CopyStringToBuffer(Errors, "<!-- %s --> must come after <!-- __CINERA_PLAYER__ -->\n", Tags[i].Tag);
+                                    CopyStringToBuffer(&Errors, "<!-- %s --> must come after <!-- __CINERA_PLAYER__ -->\n", Tags[i].Tag);
                                     HaveErrors = TRUE;
                                 }
                                 if(!Config.ForceIntegration && FoundScript == TRUE)
                                 {
-                                    CopyStringToBuffer(Errors, "(*Template) contains more than one <!-- %s --> tag\n", Tags[i].Tag);
+                                    CopyStringToBuffer(&Errors, "Template contains more than one <!-- %s --> tag\n", Tags[i].Tag);
                                     HaveErrors = TRUE;
                                 }
                                 (*Template)->Metadata.Tag[(*Template)->Metadata.TagCount].Offset = CommentStart - Previous;
@@ -1945,22 +2082,28 @@ Here:
 
     if(!Config.ForceIntegration)
     {
-        if(PageType == PAGE_INDEX && !((*Template)->Metadata.Validity & PAGE_INDEX))
+        if(TemplateType == TEMPLATE_INDEX && !((*Template)->Metadata.Validity & PAGE_INDEX))
         {
-            CopyStringToBuffer(Errors, "Index template %s must include one <!-- __CINERA_INDEX__ --> tag\n", (*Template)->Metadata.Filename);
-            fprintf(stderr, "%s", Errors->Location);
+            CopyStringToBuffer(&Errors, "Index template %s must include one <!-- __CINERA_INDEX__ --> tag\n", (*Template)->Metadata.Filename);
+            fprintf(stderr, "%s", Errors.Location);
+            DeclaimBuffer(&Errors);
+            DeclaimTemplate(*Template);
             return RC_INVALID_TEMPLATE;
         }
-        else if(PageType == PAGE_PLAYER && !((*Template)->Metadata.Validity & PAGE_PLAYER))
+        else if((TemplateType == TEMPLATE_PLAYER || TemplateType == TEMPLATE_BESPOKE) && !((*Template)->Metadata.Validity & PAGE_PLAYER))
         {
-            if(!FoundIncludes){ CopyStringToBuffer(Errors, "Player template %s must include one <!-- __CINERA_INCLUDES__ --> tag\n", (*Template)->Metadata.Filename); };
-            if(!FoundMenus){ CopyStringToBuffer(Errors, "Player template %s must include one <!-- __CINERA_MENUS__ --> tag\n", (*Template)->Metadata.Filename); };
-            if(!FoundPlayer){ CopyStringToBuffer(Errors, "Player template %s must include one <!-- __CINERA_PLAYER__ --> tag\n", (*Template)->Metadata.Filename); };
-            if(!FoundScript){ CopyStringToBuffer(Errors, "Player template %s must include one <!-- __CINERA_SCRIPT__ --> tag\n", (*Template)->Metadata.Filename); };
-            fprintf(stderr, "%s", Errors->Location);
+            if(!FoundIncludes){ CopyStringToBuffer(&Errors, "Player template %s must include one <!-- __CINERA_INCLUDES__ --> tag\n", (*Template)->Metadata.Filename); };
+            if(!FoundMenus){ CopyStringToBuffer(&Errors, "Player template %s must include one <!-- __CINERA_MENUS__ --> tag\n", (*Template)->Metadata.Filename); };
+            if(!FoundPlayer){ CopyStringToBuffer(&Errors, "Player template %s must include one <!-- __CINERA_PLAYER__ --> tag\n", (*Template)->Metadata.Filename); };
+            if(!FoundScript){ CopyStringToBuffer(&Errors, "Player template %s must include one <!-- __CINERA_SCRIPT__ --> tag\n", (*Template)->Metadata.Filename); };
+            fprintf(stderr, "%s", Errors.Location);
+            DeclaimBuffer(&Errors);
+            DeclaimTemplate(*Template);
             return RC_INVALID_TEMPLATE;
         }
     }
+
+    DeclaimBuffer(&Errors);
     return RC_SUCCESS;
 }
 
@@ -1995,17 +2138,37 @@ ConstructPlayerURL(buffer *PlayerURL, char *BaseFilename)
         if(StringsDiffer(Config.PlayerURLPrefix, ""))
         {
             char *Ptr = BaseFilename + StringLength(Config.ProjectID);
-            CopyStringToBuffer(PlayerURL, "%s%s", Config.PlayerURLPrefix, Ptr);
+            CopyStringToBuffer(PlayerURL, "%s%s/", Config.PlayerURLPrefix, Ptr);
         }
         else
         {
-            CopyStringToBuffer(PlayerURL, "%s", BaseFilename);
+            CopyStringToBuffer(PlayerURL, "%s/", BaseFilename);
         }
     }
 }
 
+bool
+MediumExists(char *Medium)
+{
+    for(int i = 0; i < ArrayCount(CategoryMedium); ++i)
+    {
+        if(!StringsDiffer(Medium, CategoryMedium[i].Medium))
+        {
+            return TRUE;
+        }
+    }
+
+    fprintf(stderr, "Specified default medium \"%s\" not available. Valid media are:\n", Medium);
+    for(int i = 0; i < ArrayCount(CategoryMedium); ++i)
+    {
+        fprintf(stderr, "    %s\n", CategoryMedium[i].Medium);
+    }
+    fprintf(stderr, "To have \"%s\" added to the list, contact matt@handmadedev.org\n", Medium);
+    return FALSE;
+}
+
 int
-HMMLToBuffers(buffers *CollationBuffers, char *Filename)
+HMMLToBuffers(buffers *CollationBuffers, template **BespokeTemplate, char *Filename)
 {
     RewindBuffer(&CollationBuffers->IncludesPlayer);
     RewindBuffer(&CollationBuffers->Menus);
@@ -2045,6 +2208,40 @@ HMMLToBuffers(buffers *CollationBuffers, char *Filename)
                 break;
             }
         }
+
+        char *DefaultMedium = Config.DefaultMedium;
+        if(HMML.metadata.medium)
+        {
+            if(MediumExists(HMML.metadata.medium))
+            {
+                DefaultMedium = HMML.metadata.medium;
+            }
+            else
+            {
+                Filename[StringLength(Filename) - StringLength(".hmml")] = '\0';
+                fprintf(stderr, "\e[1;31mSkipping\e[0m %s - %s\n", Filename, HMML.metadata.title);
+                hmml_free(&HMML);
+                return RC_ERROR_HMML;
+            }
+        }
+
+        if(HMML.metadata.template)
+        {
+            switch(ValidateTemplate(BespokeTemplate, HMML.metadata.template, TEMPLATE_BESPOKE))
+            {
+                case RC_ARENA_FULL:
+                case RC_INVALID_TEMPLATE: // Invalid template
+                case RC_ERROR_FILE: // Could not load template
+                case RC_ERROR_MEMORY: // Could not allocate memory for template
+                    Filename[StringLength(Filename) - StringLength(".hmml")] = '\0';
+                    fprintf(stderr, "\e[1;31mSkipping\e[0m %s - %s\n", Filename, HMML.metadata.title);
+                    hmml_free(&HMML);
+                    return RC_ERROR_HMML;
+                case RC_SUCCESS:
+                    break;
+            }
+        }
+
         CopyString(CollationBuffers->Title, HMML.metadata.title);
         buffer URLPlayer;
         ClaimBuffer(&URLPlayer, "URLPlayer", 2048);
@@ -2058,6 +2255,7 @@ HMMLToBuffers(buffers *CollationBuffers, char *Filename)
         }
 
         CopyString(CollationBuffers->URLPlayer, URLPlayer.Location);
+        DeclaimBuffer(&URLPlayer);
         CopyString(CollationBuffers->VideoID, HMML.metadata.id);
 
 #if DEBUG
@@ -2583,7 +2781,7 @@ AppendedIdentifier:
 
             if(LocalMedia.Count == 0)
             {
-                InsertCategory(&Topics, &LocalTopics, &Media, &LocalMedia, Config.DefaultMedium);
+                InsertCategory(&Topics, &LocalTopics, &Media, &LocalMedia, DefaultMedium);
             }
 
             BuildCategories(&AnnotationClass, &TopicDots, &LocalTopics, &LocalMedia, &MarkerIndex);
@@ -3127,7 +3325,7 @@ AppendedIdentifier:
         // TODO(matt): Maybe do something about indentation levels
 
         buffer URLIndex;
-        ClaimBuffer(&URLIndex, "URLPlayer", 2048);
+        ClaimBuffer(&URLIndex, "URLIndex", 2048);
         ConstructIndexURL(&URLIndex);
         CopyString(CollationBuffers->URLIndex, URLIndex.Location);
         DeclaimBuffer(&URLIndex);
@@ -3229,7 +3427,7 @@ Cleanup:
     else
     {
         LogError(LOG_ERROR, "%s:%d: %s", Filename, HMML.error.line, HMML.error.message);
-        fprintf(stderr, "%s:%d: %s\n", Filename, HMML.error.line, HMML.error.message);
+        fprintf(stderr, "\e[1;31mSkipping\e[0m %s:%d: %s\n", Filename, HMML.error.line, HMML.error.message);
         hmml_free(&HMML);
         return RC_ERROR_HMML;
     }
@@ -3242,7 +3440,7 @@ BuffersToHTML(buffers *CollationBuffers, template *Template, char *OutputPath, i
 {
 #if DEBUG
     printf("\n\n --- Buffer Collation ---\n"
-            " %s\n\n\n", OutputPath ? OutputPath : Config->OutLocation);
+            " %s\n\n\n", OutputPath ? OutputPath : Config.OutLocation);
 #endif
 
 #if DEBUG_MEM
@@ -3251,9 +3449,10 @@ BuffersToHTML(buffers *CollationBuffers, template *Template, char *OutputPath, i
     fclose(MemLog);
 #endif
 
-    if(Config.Mode & MODE_INTEGRATE)
+    if(Template->Metadata.Filename && StringsDiffer(Template->Metadata.Filename, ""))
     {
-        if(Template->Metadata.Validity & PageType)
+        if((Template->Metadata.Filename && StringsDiffer(Template->Metadata.Filename, ""))
+                && ((Template->Metadata.Validity & PageType) || Config.ForceIntegration))
         {
             buffer Output;
             Output.Size = Template->Buffer.Size + (Kilobytes(512));
@@ -3554,7 +3753,7 @@ typedef struct
 // TODO(matt): Increment CINERA_DB_VERSION!
 
 int
-InsertIntoIndex(buffers *CollationBuffers, char *BaseFilename)
+InsertIntoIndex(buffers *CollationBuffers, template **BespokeTemplate, char *BaseFilename)
 {
     // NOTE(matt): The index will be stored in two files:
     //             1) ProjectID.index
@@ -3605,7 +3804,20 @@ InsertIntoIndex(buffers *CollationBuffers, char *BaseFilename)
 
     char InputFile[StringLength(BaseFilename) + StringLength(".hmml")];
     CopyString(InputFile, "%s.hmml", BaseFilename);
-    HMMLToBuffers(CollationBuffers, InputFile);
+    switch(HMMLToBuffers(CollationBuffers, BespokeTemplate, InputFile))
+    {
+        // TODO(matt): Actually sort out the fatality of these cases, once we are always-on
+        case RC_ERROR_FILE:
+        case RC_ERROR_FATAL:
+            return RC_ERROR_FATAL;
+        case RC_ERROR_HMML:
+        case RC_ERROR_MAX_REFS:
+        case RC_ERROR_QUOTE:
+        case RC_INVALID_REFERENCE:
+            return RC_ERROR_HMML;
+        case RC_SUCCESS:
+            break;
+    };
 
     Index.Entry.Size = CollationBuffers->Search.Ptr - CollationBuffers->Search.Location;
     for(int i = 0; i < ArrayCount(Index.Entry.BaseFilename); ++i)
@@ -3874,10 +4086,10 @@ DeleteFromIndex(char *BaseFilename)
 }
 
 int
-IndexToBuffer(buffers *CollationBuffers)
+IndexToBuffer(buffers *CollationBuffers) // NOTE(matt): This guy malloc's CollationBuffers->Index
 {
-    // TODO(matt): Consider parsing the index into a linked list, or do something to save us having to iterate through the index
-    // file multiple times
+    // TODO(matt): Consider parsing the index into a linked / skip list, or do something to save us having to iterate through
+    // the index file multiple times
 
     index Index;
     Index.Metadata.Buffer.ID = "IndexMetadata";
@@ -3963,6 +4175,7 @@ IndexToBuffer(buffers *CollationBuffers)
         int EntryLength = 32 + StringLength(ProjectInfo[ProjectIndex].Unit) + 16 + 256;
 
         CollationBuffers->Index.Size = StringLength(queryContainer) + (Index.Header.EntryCount * EntryLength) + StringLength(Script);
+
         if(!(CollationBuffers->Index.Location = malloc(CollationBuffers->Index.Size)))
         {
             FreeBuffer(&Index.Metadata.Buffer);
@@ -4097,7 +4310,22 @@ GeneratePlayerPage(buffers *CollationBuffers, template *PlayerTemplate, char *Ba
     char PlayerPagePath[1024];
     CopyString(PlayerPagePath, "%s/index.html", OutputDirectoryPath.Location);
     DeclaimBuffer(&OutputDirectoryPath);
+
+    bool IndexInTemplate = FALSE;
+    for(int TagIndex = 0; TagIndex < PlayerTemplate->Metadata.TagCount; ++TagIndex)
+    {
+        if(PlayerTemplate->Metadata.Tag[TagIndex].TagCode == TAG_INDEX)
+        {
+            IndexInTemplate = TRUE;
+            IndexToBuffer(CollationBuffers);
+            break;
+        }
+    }
     BuffersToHTML(CollationBuffers, PlayerTemplate, PlayerPagePath, PAGE_PLAYER);
+    if(IndexInTemplate)
+    {
+        FreeBuffer(&CollationBuffers->Index);
+    }
     return RC_SUCCESS;
 }
 
@@ -4179,7 +4407,7 @@ DeleteEntry(char *BaseFilename)
 }
 
 int
-MonitorDirectory(buffers *CollationBuffers, template *IndexTemplate, template *PlayerTemplate, int inotifyInstance, int WatchDescriptor)
+MonitorDirectory(buffers *CollationBuffers, template *IndexTemplate, template *PlayerTemplate, template *BespokeTemplate, int inotifyInstance, int WatchDescriptor)
 {
 
 #if DEBUG_MEM
@@ -4201,8 +4429,8 @@ MonitorDirectory(buffers *CollationBuffers, template *IndexTemplate, template *P
                 Events.Ptr < Events.Location + BytesRead && Events.Ptr - Events.Location < Events.Size; 
                 Events.Ptr += sizeof(struct inotify_event) + Event->len)
         {
+NextEvent:
             Event = (struct inotify_event *)Events.Ptr;
-
             char *Ptr;
             Ptr = Event->name;
             Ptr += (StringLength(Event->name) - StringLength(".hmml"));
@@ -4221,10 +4449,32 @@ MonitorDirectory(buffers *CollationBuffers, template *IndexTemplate, template *P
                 }
                 else
                 {
-                    InsertIntoIndex(CollationBuffers, BaseFilename);
-                    GeneratePlayerPage(CollationBuffers, PlayerTemplate, BaseFilename);
+                    if(InsertIntoIndex(CollationBuffers, &BespokeTemplate, BaseFilename) == RC_SUCCESS)
+                    {
+                        if(BespokeTemplate->Metadata.Filename && StringsDiffer(BespokeTemplate->Metadata.Filename, ""))
+                        {
+                            GeneratePlayerPage(CollationBuffers, BespokeTemplate, BaseFilename);
+                            DeclaimTemplate(BespokeTemplate);
+                        }
+                        else
+                        {
+                            GeneratePlayerPage(CollationBuffers, PlayerTemplate, BaseFilename);
+                        }
+                        GenerateIndexPage(CollationBuffers, IndexTemplate);
+                    }
+                    else
+                    {
+                        if(Events.Ptr < Events.Location + BytesRead && Events.Ptr - Events.Location < Events.Size)
+                        {
+                            Events.Ptr += sizeof(struct inotify_event) + Event->len;
+                            goto NextEvent;
+                        }
+                        else
+                        {
+                            break;
+                        }
+                    }
                 }
-                GenerateIndexPage(CollationBuffers, IndexTemplate);
             }
         }
     }
@@ -4239,7 +4489,7 @@ RemoveDirectory(char *Path)
     if((remove(Path) == -1))
     {
         LogError(LOG_NOTICE, "Unable to remove directory %s: %s", Path, strerror(errno));
-        fprintf(stderr, "\e[1;30mUnable to remove directory\e[0m %s: %s", Path, strerror(errno));
+        fprintf(stderr, "\e[1;30mUnable to remove directory\e[0m %s: %s\n", Path, strerror(errno));
         return RC_ERROR_DIRECTORY;
     }
     else
@@ -4267,15 +4517,6 @@ RemoveDirectoryRecursively(char *Path)
     return RC_SUCCESS;
 }
 
-void
-Clear(char *String, int Size)
-{
-    for(int i = 0; i < Size; ++i)
-    {
-        String[i] = 0;
-    }
-}
-
 int
 UpgradeDB(index *Index)
 {
@@ -4476,7 +4717,7 @@ DeleteDeadIndexEntries()
 }
 
 int
-SyncIndexWithInput(buffers *CollationBuffers, template *IndexTemplate, template *PlayerTemplate)
+SyncIndexWithInput(buffers *CollationBuffers, template *IndexTemplate, template *PlayerTemplate, template *BespokeTemplate)
 {
     bool Deleted = FALSE;
     if(DeleteDeadIndexEntries() == RC_SUCCESS)
@@ -4502,9 +4743,19 @@ SyncIndexWithInput(buffers *CollationBuffers, template *IndexTemplate, template
         if(!(StringsDiffer(Ptr, ".hmml")))
         {
             *Ptr = '\0';
-            InsertIntoIndex(CollationBuffers, ProjectFiles->d_name);
-            GeneratePlayerPage(CollationBuffers, PlayerTemplate, ProjectFiles->d_name);
-            Inserted = TRUE;
+            if(InsertIntoIndex(CollationBuffers, &BespokeTemplate, ProjectFiles->d_name) == RC_SUCCESS)
+            {
+                if(BespokeTemplate->Metadata.Filename && StringsDiffer(BespokeTemplate->Metadata.Filename, ""))
+                {
+                    GeneratePlayerPage(CollationBuffers, BespokeTemplate, ProjectFiles->d_name);
+                    DeclaimTemplate(BespokeTemplate);
+                }
+                else
+                {
+                    GeneratePlayerPage(CollationBuffers, PlayerTemplate, ProjectFiles->d_name);
+                }
+                Inserted = TRUE;
+            }
         }
     }
     closedir(ProjectDirHandle);
@@ -4540,6 +4791,9 @@ main(int ArgC, char **Args)
         .CSSDir = "",
         .ImagesDir = "",
         .JSDir = "",
+        .TemplatesDir = ".",
+        .TemplateIndexLocation = "",
+        .TemplatePlayerLocation = "",
         .BaseDir = ".",
         .BaseURL = "",
         .IndexLocation = "",
@@ -4547,15 +4801,13 @@ main(int ArgC, char **Args)
         .Edition = EDITION_SINGLE,
         .LogLevel = LOG_EMERGENCY,
         .DefaultMedium = "programming",
-        .Mode = getenv("CINERA_MODE") ? MODE_INTEGRATE : MODE_BARE,
+        .Mode = 0,
         .OutLocation = "out.html",
         .OutIntegratedLocation = "out_integrated.html",
         .ForceIntegration = FALSE,
         .ProjectDir = ".",
         .ProjectID = "",
         .Theme = "",
-        .TemplatePlayerLocation = "template_player.html",
-        .TemplateIndexLocation = "template_index.html",
         .UpdateInterval = 4,
         .PlayerURLPrefix = ""
     };
@@ -4578,7 +4830,7 @@ main(int ArgC, char **Args)
     }
 
     char CommandLineArg;
-    while((CommandLineArg = getopt(ArgC, Args, "a:b:B:c:d:fhi:j:l:m:n:o:p:qr:R:s:t:U:vx:")) != -1)
+    while((CommandLineArg = getopt(ArgC, Args, "a:b:B:c:d:fhi:j:l:m:n:o:p:qr:R:s:t:U:vx:y:")) != -1)
     {
         switch(CommandLineArg)
         {
@@ -4636,8 +4888,7 @@ main(int ArgC, char **Args)
                 Config.Theme = optarg;
                 break;
             case 't':
-                Config.TemplatePlayerLocation = optarg;
-                Config.Mode |= MODE_INTEGRATE;
+                Config.TemplatesDir = StripTrailingSlash(optarg);
                 break;
             case 'U':
                 Config.UpdateInterval = StringToInt(optarg);
@@ -4647,7 +4898,9 @@ main(int ArgC, char **Args)
                 return RC_SUCCESS;
             case 'x':
                 Config.TemplateIndexLocation = optarg;
-                Config.Mode |= MODE_INTEGRATE;
+                break;
+            case 'y':
+                Config.TemplatePlayerLocation = optarg;
                 break;
             case 'h':
             default:
@@ -4676,24 +4929,10 @@ main(int ArgC, char **Args)
         }
     }
 
-    bool ValidDefaultMedium = FALSE;
-    for(int i = 0; i < ArrayCount(CategoryMedium); ++i)
+    if(!MediumExists(Config.DefaultMedium))
     {
-        if(!StringsDiffer(Config.DefaultMedium, CategoryMedium[i].Medium))
-        {
-            ValidDefaultMedium = TRUE;
-            break;
-        }
-    }
-    if(!ValidDefaultMedium)
-    {
-        fprintf(stderr, "Specified default medium \"%s\" not available. Valid media are:\n", Config.DefaultMedium);
-        for(int i = 0; i < ArrayCount(CategoryMedium); ++i)
-        {
-            fprintf(stderr, "    %s\n", CategoryMedium[i].Medium);
-        }
-        fprintf(stderr, "To have \"%s\" added to the list, contact matt@handmadedev.org\n", Config.DefaultMedium);
-        return 1;
+        // TODO(matt): We'll want to stick around when we have multiple projects configured
+        exit(RC_RIP);
     }
 
     // NOTE(matt): Init MemoryArena (it is global)
@@ -4716,9 +4955,6 @@ main(int ArgC, char **Args)
     printf("Allocated MemoryArena: %d\n\n", MemoryArena.Size);
 #endif
 
-    buffer Errors;
-    if(ClaimBuffer(&Errors, "Errors", Kilobytes(1)) == RC_ARENA_FULL) { goto RIP; };
-
     // NOTE(matt): Tree structure of buffer dependencies
     //     IncludesPlayer
     //     Menus
@@ -4743,16 +4979,17 @@ main(int ArgC, char **Args)
     //
     // Config will contain paths of multiple templates
     // App is running all the time, and picking up changes to the config as we go
-    // If we find a new template, we first of all validate it
-    //      In our case here, we just want to straight up validate a template if Config.Mode & MODE_INTEGRATE
-    //      And, in that same state, we gotta keep a Template buffer around
+    // If we find a new template, we first of all Init and Validate it
+    //      In our case here, we just want to straight up Init our three possible templates
+    //      and Validate the Index and Player templates if their locations are set
 
-    template *PlayerTemplate;
-    template *IndexTemplate;
+    template *IndexTemplate; InitTemplate(&IndexTemplate);
+    template *PlayerTemplate; InitTemplate(&PlayerTemplate);
+    template *BespokeTemplate; InitTemplate(&BespokeTemplate);
 
-    if(Config.Mode & MODE_INTEGRATE)
+    if(StringsDiffer(Config.TemplatePlayerLocation, ""))
     {
-        switch(ValidateTemplate(&Errors, &PlayerTemplate, PAGE_PLAYER))
+        switch(ValidateTemplate(&PlayerTemplate, Config.TemplatePlayerLocation, TEMPLATE_PLAYER))
         {
             case RC_INVALID_TEMPLATE: // Invalid template
             case RC_ERROR_FILE: // Could not load template
@@ -4761,18 +4998,18 @@ main(int ArgC, char **Args)
             case RC_SUCCESS:
                 break;
         }
+    }
 
-        if(Config.Edition == EDITION_PROJECT)
+    if(Config.Edition == EDITION_PROJECT && StringsDiffer(Config.TemplateIndexLocation, ""))
+    {
+        switch(ValidateTemplate(&IndexTemplate, Config.TemplateIndexLocation, TEMPLATE_INDEX))
         {
-            switch(ValidateTemplate(&Errors, &IndexTemplate, PAGE_INDEX))
-            {
-                case RC_INVALID_TEMPLATE: // Invalid template
-                case RC_ERROR_MEMORY: // Could not allocate memory for template
-                case RC_ERROR_FILE: // Could not load template
-                    goto RIP;
-                case RC_SUCCESS:
-                    break;
-            }
+            case RC_INVALID_TEMPLATE: // Invalid template
+            case RC_ERROR_MEMORY: // Could not allocate memory for template
+            case RC_ERROR_FILE: // Could not load template
+                goto RIP;
+            case RC_SUCCESS:
+                break;
         }
     }
 
@@ -4795,7 +5032,7 @@ main(int ArgC, char **Args)
         // TODO(matt): Also log these startup messages?
         PrintVersions();
         printf( "\n"
-                "Globals\n"
+                "Universal\n"
                 "    Cache Directory: \e[1;30m(XDG_CACHE_HOME)\e[0m\t%s\n"
                 "\n"
                 "    Root\n"
@@ -4804,49 +5041,53 @@ main(int ArgC, char **Args)
                 "    Paths relative to root\n"
                 "        CSS: \e[1;30m(-c)\e[0m\t\t\t%s\n"
                 "        Images: \e[1;30m(-i)\e[0m\t\t\t%s\n"
-                "        JS: \e[1;30m(-j)\e[0m\t\t\t%s\n",
-                Config.CacheDir,
-                Config.RootDir,
-                StringsDiffer(Config.RootURL, "") ? Config.RootURL : "[empty]",
-
-                StringsDiffer(Config.CSSDir, "") ? Config.CSSDir : "(same as root)",
-                StringsDiffer(Config.ImagesDir, "") ? Config.ImagesDir : "(same as root)",
-                StringsDiffer(Config.JSDir, "") ? Config.JSDir : "(same as root)");
-
-        if(Config.Mode & MODE_INTEGRATE)
-        {
-            printf("        Index Template: \e[1;30m(-x)\e[0m\t\t%s\n"
-                   "        Player Template: \e[1;30m(-t)\e[0m\t\t%s\n",
-                    StringsDiffer(Config.TemplateIndexLocation, "") ? Config.TemplateIndexLocation : "(same as root)",
-                    StringsDiffer(Config.TemplatePlayerLocation, "") ? Config.TemplatePlayerLocation : "(same as root)");
-        }
-
-        printf("\n"
+                "        JS: \e[1;30m(-j)\e[0m\t\t\t%s\n"
+                "\n"
                 "Project\n"
+                "    ID: \e[1;30m(-p)\e[0m\t\t\t\t%s\n"
+                "    Default Medium: \e[1;30m(-m)\e[0m\t\t%s\n"
+                "    Style / Theme: \e[1;30m(-s)\e[0m\t\t\t%s\n"
+                "\n"
+                "Input Paths\n"
+                "    Annotations Directory: \e[1;30m(-d)\e[0m\t\t%s\n"
+                "    Templates Directory: \e[1;30m(-t)\e[0m\t\t%s\n"
+                "        Index Template: \e[1;30m(-x)\e[0m\t\t%s\n"
+                "        Player Template: \e[1;30m(-y)\e[0m\t\t%s\n"
+                "\n"
+                "Output Paths\n"
                 "    Base\n"
                 "       Directory: \e[1;30m(-b)\e[0m\t\t\t%s\n"
                 "       URL: \e[1;30m(-B)\e[0m\t\t\t%s\n"
                 "    Paths relative to base\n"
                 "       Index Page: \e[1;30m(-n)\e[0m\t\t\t%s\n"
-                /* NOTE(matt): Here, I think, is where we'll split into sub-projects */
+                /* NOTE(matt): Here, I think, is where we'll split into sub-projects (...really?...) */
                 "       Player Page(s): \e[1;30m(-a)\e[0m\t\t%s\n"
-                "    ID: \e[1;30m(-p)\e[0m\t\t\t\t%s\n"
-                "    Input Directory: \e[1;30m(-d)\e[0m\t\t%s\n"
-                "    Player Page URL Prefix: \e[1;30m(hardcoded)\e[0m\t%s\n"
-                "    Default Medium: \e[1;30m(-m)\e[0m\t\t%s\n"
-                "    Style / Theme: \e[1;30m(-s)\e[0m\t\t\t%s\n"
+                "       Player Page Prefix: \e[1;30m(hardcoded)\e[0m\t%s\n"
                 "\n",
 
+                Config.CacheDir,
+
+                Config.RootDir,
+                StringsDiffer(Config.RootURL, "") ? Config.RootURL : "[empty]",
+
+                StringsDiffer(Config.CSSDir, "") ? Config.CSSDir : "(same as root)",
+                StringsDiffer(Config.ImagesDir, "") ? Config.ImagesDir : "(same as root)",
+                StringsDiffer(Config.JSDir, "") ? Config.JSDir : "(same as root)",
+
+                Config.ProjectID,
+                Config.DefaultMedium,
+                StringsDiffer(Config.Theme, "") ? Config.Theme: Config.ProjectID,
+
+                Config.ProjectDir,
+                Config.TemplatesDir,
+                StringsDiffer(Config.TemplateIndexLocation, "") ? Config.TemplateIndexLocation : "[none set]",
+                StringsDiffer(Config.TemplatePlayerLocation, "") ? Config.TemplatePlayerLocation : "[none set]",
+
                 Config.BaseDir,
                 StringsDiffer(Config.BaseURL, "") ? Config.BaseURL : "[empty]",
                 StringsDiffer(Config.IndexLocation, "") ? Config.IndexLocation : "(same as base)",
-
                 StringsDiffer(Config.PlayerLocation, "") ? Config.PlayerLocation : "(directly descended from base)",
-                Config.ProjectID,
-                Config.ProjectDir,
-                StringsDiffer(Config.PlayerURLPrefix, "") ? Config.PlayerURLPrefix : Config.ProjectID,
-                Config.DefaultMedium,
-                StringsDiffer(Config.Theme, "") ? Config.Theme: Config.ProjectID);
+                StringsDiffer(Config.PlayerURLPrefix, "") ? Config.PlayerURLPrefix : Config.ProjectID);
 
         if((StringsDiffer(Config.IndexLocation, "") || StringsDiffer(Config.PlayerLocation, ""))
                 && StringLength(Config.BaseURL) == 0)
@@ -4857,7 +5098,7 @@ main(int ArgC, char **Args)
         }
 
         printf("┌╼ Synchronising with annotation files in Project Input Directory ╾┐\n");
-        SyncIndexWithInput(&CollationBuffers, IndexTemplate, PlayerTemplate);
+        SyncIndexWithInput(&CollationBuffers, IndexTemplate, PlayerTemplate, BespokeTemplate);
         if(Config.Mode & MODE_ONESHOT)
         {
             goto RIP;
@@ -4868,7 +5109,7 @@ main(int ArgC, char **Args)
         // NOTE(matt): Do we want to also watch IN_DELETE_SELF events?
         int WatchDescriptor = inotify_add_watch(inotifyInstance, Config.ProjectDir, IN_CLOSE_WRITE | IN_DELETE | IN_MOVED_FROM | IN_MOVED_TO);
 
-        while(MonitorDirectory(&CollationBuffers, IndexTemplate, PlayerTemplate, inotifyInstance, WatchDescriptor) != RC_ERROR_FATAL)
+        while(MonitorDirectory(&CollationBuffers, IndexTemplate, PlayerTemplate, BespokeTemplate, inotifyInstance, WatchDescriptor) != RC_ERROR_FATAL)
         {
             sleep(Config.UpdateInterval);
         }
@@ -4886,7 +5127,7 @@ NextFile:
         // TODO(matt): Just change the default output location so all these guys won't overwrite each other
         for(int FileIndex = optind; FileIndex < ArgC; ++FileIndex)
         {
-            switch(HMMLToBuffers(&CollationBuffers, Args[FileIndex]))
+            switch(HMMLToBuffers(&CollationBuffers, &BespokeTemplate, Args[FileIndex]))
             {
                 // TODO(matt): Actually sort out the fatality of these cases, once we are always-on
                 case RC_ERROR_FILE:
@@ -4916,13 +5157,13 @@ NextFile:
         }
     }
 
-    if(Config.Mode & MODE_INTEGRATE)
+    if(StringsDiffer(PlayerTemplate->Metadata.Filename, ""))
     {
         DeclaimTemplate(PlayerTemplate);
-        if(Config.Edition == EDITION_PROJECT)
-        {
-            DeclaimTemplate(IndexTemplate);
-        }
+    }
+    if(Config.Edition == EDITION_PROJECT && StringsDiffer(IndexTemplate->Metadata.Filename, ""))
+    {
+        DeclaimTemplate(IndexTemplate);
     }
 
     DeclaimBuffer(&CollationBuffers.ScriptIndex);
@@ -4933,7 +5174,6 @@ NextFile:
     DeclaimBuffer(&CollationBuffers.Player);
     DeclaimBuffer(&CollationBuffers.Menus);
     DeclaimBuffer(&CollationBuffers.IncludesPlayer);
-    DeclaimBuffer(&Errors);
 RIP:
     free(MemoryArena.Location);