diff --git a/cinera/cinera.c b/cinera/cinera.c
index 2ec555b..a778993 100644
--- a/cinera/cinera.c
+++ b/cinera/cinera.c
@@ -16,7 +16,7 @@ typedef struct
 version CINERA_APP_VERSION = {
     .Major = 0,
     .Minor = 5,
-    .Patch = 58
+    .Patch = 59
 };
 
 // TODO(matt): Copy in the DB 3 stuff from cinera_working.c
@@ -6490,8 +6490,9 @@ main(int ArgC, char **Args)
                 CopyStringNoFormat(CollationBuffers.ProjectID, sizeof(CollationBuffers.ProjectID), Config.ProjectID);
                 if(!StringsDiffer(Config.Theme, ""))
                 {
-                    CopyStringNoFormat(CollationBuffers.Theme, sizeof(CollationBuffers.Theme), Config.ProjectID);
+                    CopyStringNoFormat(Config.Theme, sizeof(Config.Theme), Config.ProjectID);
                 }
+                CopyStringNoFormat(CollationBuffers.Theme, sizeof(CollationBuffers.Theme), Config.Theme);
                 if(StringsDiffer(ProjectInfo[ProjectInfoIndex].FullName, ""))
                 {
                    CopyStringNoFormat(CollationBuffers.ProjectName, sizeof(CollationBuffers.ProjectName), ProjectInfo[ProjectInfoIndex].FullName);
@@ -6656,7 +6657,7 @@ main(int ArgC, char **Args)
 
                 Config.ProjectID,
                 Config.DefaultMedium,
-                StringsDiffer(Config.Theme, "") ? Config.Theme: Config.ProjectID,
+                Config.Theme,
 
                 Config.ProjectDir,
                 Config.TemplatesDir,