diff --git a/templates/topics.html b/templates/topics.html
index b5bdea20..bc1f36cb 100644
--- a/templates/topics.html
+++ b/templates/topics.html
@@ -4,7 +4,7 @@
{{range .ItemList}}
diff --git a/themes.go b/themes.go
new file mode 100644
index 00000000..91a0b335
--- /dev/null
+++ b/themes.go
@@ -0,0 +1,319 @@
+/* Copyright Azareal 2016 - 2017 */
+package main
+
+import "fmt"
+import "log"
+import "io"
+import "os"
+import "strings"
+import "mime"
+import "io/ioutil"
+import "path/filepath"
+import "encoding/json"
+import "net/http"
+
+var defaultTheme string
+var themes map[string]Theme = make(map[string]Theme)
+//var overriden_templates map[string]interface{} = make(map[string]interface{})
+var overriden_templates map[string]bool = make(map[string]bool)
+
+type Theme struct
+{
+ Name string
+ FriendlyName string
+ Version string
+ Creator string
+ Settings map[string]ThemeSetting
+ Templates []TemplateMapping
+
+ // This variable should only be set and unset by the system, not the theme meta file
+ Active bool
+}
+
+type ThemeSetting struct
+{
+ FriendlyName string
+ Options []string
+}
+
+type TemplateMapping struct
+{
+ Name string
+ Source string
+ //When string
+}
+
+func init_themes() {
+ themeFiles, err := ioutil.ReadDir("./themes")
+ if err != nil {
+ log.Fatal(err)
+ }
+
+ for _, themeFile := range themeFiles {
+ if !themeFile.IsDir() {
+ continue
+ }
+
+ themeName := themeFile.Name()
+ log.Print("Adding theme '" + themeName + "'")
+ themeFile, err := ioutil.ReadFile("./themes/" + themeName + "/theme.json")
+ if err != nil {
+ log.Fatal(err)
+ }
+
+ var theme Theme
+ json.Unmarshal(themeFile, &theme)
+ theme.Active = false // Set this to false, just in case someone explicitly overrode this value in the JSON file
+
+ themes[theme.Name] = theme
+ }
+}
+
+func add_theme_static_files(themeName string) {
+ err := filepath.Walk("./themes/" + themeName + "/public", func(path string, f os.FileInfo, err error) error {
+ if err != nil {
+ return err
+ }
+ if f.IsDir() {
+ return nil
+ }
+ path = strings.Replace(path,"\\","/",-1)
+
+ log.Print("Attempting to add static file '" + path + "' for default theme '" + themeName + "'")
+ data, err := ioutil.ReadFile(path)
+ if err != nil {
+ return err
+ }
+
+ path = strings.TrimPrefix(path,"themes/" + themeName + "/public")
+ log.Print("Added the '" + path + "' static file for default theme " + themeName + ".")
+
+ static_files["/static" + path] = SFile{data,0,int64(len(data)),mime.TypeByExtension(filepath.Ext("/themes/" + themeName + "/public" + path)),f,f.ModTime().UTC().Format(http.TimeFormat)}
+ return nil
+ })
+ if err != nil {
+ panic(err)
+ }
+}
+
+func map_theme_templates(theme Theme) {
+ if theme.Templates != nil {
+ for _, themeTmpl := range theme.Templates {
+ if themeTmpl.Name == "" {
+ log.Fatal("Invalid destination template name")
+ }
+ if themeTmpl.Source == "" {
+ log.Fatal("Invalid source template name")
+ }
+
+ // go generate is one possibility, but it would simply add another step of compilation
+
+ dest_tmpl_ptr, ok := tmpl_ptr_map[themeTmpl.Name]
+ if !ok {
+ log.Fatal("The destination template doesn't exist!")
+ }
+ source_tmpl_ptr, ok := tmpl_ptr_map[themeTmpl.Source]
+ if !ok {
+ log.Fatal("The source template doesn't exist!")
+ }
+
+ switch d_tmpl_ptr := dest_tmpl_ptr.(type) {
+ case *func(TopicPage,io.Writer):
+ switch s_tmpl_ptr := source_tmpl_ptr.(type) {
+ case *func(TopicPage,io.Writer):
+ //overriden_templates[themeTmpl.Name] = d_tmpl_ptr
+ overriden_templates[themeTmpl.Name] = true
+ log.Print("Topic Handle")
+ fmt.Println(template_topic_handle)
+ log.Print("Before")
+ fmt.Println(d_tmpl_ptr)
+ fmt.Println(*d_tmpl_ptr)
+ log.Print("Source")
+ fmt.Println(s_tmpl_ptr)
+ fmt.Println(*s_tmpl_ptr)
+ *d_tmpl_ptr = *s_tmpl_ptr
+ log.Print("After")
+ fmt.Println(d_tmpl_ptr)
+ fmt.Println(*d_tmpl_ptr)
+ log.Print("Source")
+ fmt.Println(s_tmpl_ptr)
+ fmt.Println(*s_tmpl_ptr)
+ default:
+ log.Fatal("The source and destination templates are incompatible")
+ }
+ case *func(TopicsPage,io.Writer):
+ switch s_tmpl_ptr := source_tmpl_ptr.(type) {
+ case *func(TopicsPage,io.Writer):
+ //overriden_templates[themeTmpl.Name] = d_tmpl_ptr
+ overriden_templates[themeTmpl.Name] = true
+ *d_tmpl_ptr = *s_tmpl_ptr
+ default:
+ log.Fatal("The source and destination templates are incompatible")
+ }
+ case *func(ForumPage,io.Writer):
+ switch s_tmpl_ptr := source_tmpl_ptr.(type) {
+ case *func(ForumPage,io.Writer):
+ //overriden_templates[themeTmpl.Name] = d_tmpl_ptr
+ overriden_templates[themeTmpl.Name] = true
+ *d_tmpl_ptr = *s_tmpl_ptr
+ default:
+ log.Fatal("The source and destination templates are incompatible")
+ }
+ case *func(ForumsPage,io.Writer):
+ switch s_tmpl_ptr := source_tmpl_ptr.(type) {
+ case *func(ForumsPage,io.Writer):
+ //overriden_templates[themeTmpl.Name] = d_tmpl_ptr
+ overriden_templates[themeTmpl.Name] = true
+ *d_tmpl_ptr = *s_tmpl_ptr
+ default:
+ log.Fatal("The source and destination templates are incompatible")
+ }
+ case *func(ProfilePage,io.Writer):
+ switch s_tmpl_ptr := source_tmpl_ptr.(type) {
+ case *func(ProfilePage,io.Writer):
+ //overriden_templates[themeTmpl.Name] = d_tmpl_ptr
+ overriden_templates[themeTmpl.Name] = true
+ *d_tmpl_ptr = *s_tmpl_ptr
+ default:
+ log.Fatal("The source and destination templates are incompatible")
+ }
+ case *func(Page,io.Writer):
+ switch s_tmpl_ptr := source_tmpl_ptr.(type) {
+ case *func(Page,io.Writer):
+ //overriden_templates[themeTmpl.Name] = d_tmpl_ptr
+ overriden_templates[themeTmpl.Name] = true
+ *d_tmpl_ptr = *s_tmpl_ptr
+ default:
+ log.Fatal("The source and destination templates are incompatible")
+ }
+ default:
+ log.Fatal("Unknown destination template type!")
+ }
+ }
+ }
+}
+
+func reset_template_overrides() {
+ log.Print("Resetting the template overrides")
+
+ for name, _ := range overriden_templates {
+ log.Print("Resetting '" + name + "' template override")
+
+ origin_pointer, ok := tmpl_ptr_map["o_" + name]
+ if !ok {
+ //log.Fatal("The origin template doesn't exist!")
+ log.Print("The origin template doesn't exist!")
+ return
+ }
+
+ dest_tmpl_ptr, ok := tmpl_ptr_map[name]
+ if !ok {
+ //log.Fatal("The destination template doesn't exist!")
+ log.Print("The destination template doesn't exist!")
+ return
+ }
+
+ switch o_ptr := origin_pointer.(type) {
+ case func(TopicPage,io.Writer):
+ switch d_ptr := dest_tmpl_ptr.(type) {
+ case *func(TopicPage,io.Writer):
+ log.Print("Topic Handle")
+ fmt.Println(template_topic_handle)
+ log.Print("Before")
+ fmt.Println(d_ptr)
+ fmt.Println(*d_ptr)
+ log.Print("Origin")
+ fmt.Println(o_ptr)
+ *d_ptr = o_ptr
+ log.Print("After")
+ fmt.Println(d_ptr)
+ fmt.Println(*d_ptr)
+ log.Print("Origin")
+ fmt.Println(o_ptr)
+ default:
+ log.Fatal("The origin and destination templates are incompatible")
+ }
+ case *func(TopicsPage,io.Writer):
+ switch d_ptr := dest_tmpl_ptr.(type) {
+ case *func(TopicsPage,io.Writer):
+ *d_ptr = o_ptr
+ default:
+ log.Fatal("The origin and destination templates are incompatible")
+ }
+ case *func(ForumPage,io.Writer):
+ switch d_ptr := dest_tmpl_ptr.(type) {
+ case *func(ForumPage,io.Writer):
+ *d_ptr = o_ptr
+ default:
+ log.Fatal("The origin and destination templates are incompatible")
+ }
+ case *func(ForumsPage,io.Writer):
+ switch d_ptr := dest_tmpl_ptr.(type) {
+ case *func(ForumsPage,io.Writer):
+ *d_ptr = o_ptr
+ default:
+ log.Fatal("The origin and destination templates are incompatible")
+ }
+ case *func(ProfilePage,io.Writer):
+ switch d_ptr := dest_tmpl_ptr.(type) {
+ case *func(ProfilePage,io.Writer):
+ *d_ptr = o_ptr
+ default:
+ log.Fatal("The origin and destination templates are incompatible")
+ }
+ default:
+ log.Fatal("Unknown destination template type!")
+ }
+ log.Print("The template override was reset")
+ }
+ overriden_templates = make(map[string]bool)
+ log.Print("All of the template overrides have been reset")
+
+ /*for name, origin_pointer := range overriden_templates {
+ dest_tmpl_ptr, ok := tmpl_ptr_map[name]
+ if !ok {
+ log.Fatal("The destination template doesn't exist!")
+ }
+
+ switch o_ptr := origin_pointer.(type) {
+ case *func(TopicPage,io.Writer):
+ switch d_ptr := dest_tmpl_ptr.(type) {
+ case *func(TopicPage,io.Writer):
+ *d_ptr = *o_ptr
+ default:
+ log.Fatal("The origin and destination templates are incompatible")
+ }
+ case *func(TopicsPage,io.Writer):
+ switch d_ptr := dest_tmpl_ptr.(type) {
+ case *func(TopicsPage,io.Writer):
+ *d_ptr = *o_ptr
+ default:
+ log.Fatal("The origin and destination templates are incompatible")
+ }
+ case *func(ForumPage,io.Writer):
+ switch d_ptr := dest_tmpl_ptr.(type) {
+ case *func(ForumPage,io.Writer):
+ *d_ptr = *o_ptr
+ default:
+ log.Fatal("The origin and destination templates are incompatible")
+ }
+ case *func(ForumsPage,io.Writer):
+ switch d_ptr := dest_tmpl_ptr.(type) {
+ case *func(ForumsPage,io.Writer):
+ *d_ptr = *o_ptr
+ default:
+ log.Fatal("The origin and destination templates are incompatible")
+ }
+ case *func(ProfilePage,io.Writer):
+ switch d_ptr := dest_tmpl_ptr.(type) {
+ case *func(ProfilePage,io.Writer):
+ *d_ptr = *o_ptr
+ default:
+ log.Fatal("The origin and destination templates are incompatible")
+ }
+ default:
+ log.Fatal("Unknown destination template type!")
+ }
+ delete(overriden_templates, name)
+ }*/
+}
diff --git a/themes/cosmo/public/stars-mk1.png b/themes/cosmo/public/stars-mk1.png
new file mode 100644
index 00000000..723b7a73
Binary files /dev/null and b/themes/cosmo/public/stars-mk1.png differ
diff --git a/themes/cosmo/theme.json b/themes/cosmo/theme.json
new file mode 100644
index 00000000..f7ae1441
--- /dev/null
+++ b/themes/cosmo/theme.json
@@ -0,0 +1,12 @@
+{
+ "Name": "cosmo",
+ "FriendlyName": "AtomBB Cosmo",
+ "Version": "Coming Soon",
+ "Creator": "Azareal",
+ "Templates": [
+ {
+ "Name": "topic",
+ "Source": "topic_alt"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/public/main.css b/themes/tempra-conflux/public/main.css
similarity index 100%
rename from public/main.css
rename to themes/tempra-conflux/public/main.css
diff --git a/themes/tempra-conflux/theme.json b/themes/tempra-conflux/theme.json
new file mode 100644
index 00000000..06ded26c
--- /dev/null
+++ b/themes/tempra-conflux/theme.json
@@ -0,0 +1,12 @@
+{
+ "Name": "tempra-conflux",
+ "FriendlyName": "Tempra Conflux",
+ "Version": "0.0.1",
+ "Creator": "Azareal",
+ "Templates": [
+ {
+ "Name": "topic",
+ "Source": "topic_alt"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/themes/tempra-simple/public/main.css b/themes/tempra-simple/public/main.css
new file mode 100644
index 00000000..e5039a61
--- /dev/null
+++ b/themes/tempra-simple/public/main.css
@@ -0,0 +1,409 @@
+* {
+ box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+}
+
+body
+{
+ font-family: arial;
+}
+
+@font-face {
+ font-family: 'EmojiFont';
+ src: url('https://github.com/Ranks/emojione/raw/master/assets/fonts/emojione-svg.woff2') format('woff2'),
+ url('https://github.com/Ranks/emojione/raw/master/assets/fonts/emojione-svg.woff') format('woff'), local("arial");
+}
+
+@supports (-ms-ime-align:auto) {
+.user_content
+{
+ font-family: EmojiFont, arial;
+}
+}
+@-moz-document url-prefix() {
+.user_content
+{
+ font-family: EmojiFont, arial;
+}
+}
+
+/*.move_left{float: left;position: relative;left: 50%;}
+.move_right{float: left;position: relative;left: -50%;}*/
+ul
+{
+ padding-left: 0px;
+ padding-right: 0px;
+ height: 28px;
+ list-style-type: none;
+ border: 1px solid #ccc;
+}
+li
+{
+ height: 26px;
+ padding-left: 10px;
+ padding-top: 5px;
+ padding-bottom: 5px;
+ font-weight: bold;
+ text-transform: uppercase;
+}
+li:hover { background: rgb(250,250,250); }
+li a
+{
+ text-decoration: none;
+ color: #515151;
+}
+/*li a:hover { color: #7a7a7a; }*/
+.menu_left
+{
+ float: left;
+ border-right: 1px solid #ccc;
+ padding-right: 10px;
+}
+.menu_right
+{
+ float: right;
+ border-left: 1px solid #ccc;
+ padding-right: 10px;
+}
+
+.container
+{
+ width: 90%;
+ padding: 0px;
+ margin-left: auto;
+ margin-right: auto;
+}
+
+.rowblock
+{
+ border: 1px solid #ccc;
+ width: 100%;
+ padding: 0px;
+ padding-top: 0px;
+}
+.rowblock:empty
+{
+ display: none;
+}
+
+.colblock_left
+{
+ border: 1px solid #ccc;
+ padding: 0px;
+ padding-top: 0px;
+ width: 30%;
+ float: left;
+ margin-right: 8px;
+}
+.colblock_right
+{
+ border: 1px solid #ccc;
+ padding: 0px;
+ padding-top: 0px;
+ width: 65%;
+ overflow: hidden;
+ word-wrap: break-word;
+}
+.colblock_left:empty
+{
+ display: none;
+}
+.colblock_right:empty
+{
+ display: none;
+}
+
+.rowitem
+{
+ width: 100%;
+ padding-left: 8px;
+ padding-right: 8px;
+ padding-top: 17px;
+ padding-bottom: 12px;
+ font-weight: bold;
+ text-transform: uppercase;
+}
+.rowitem.passive
+{
+ font-weight: normal;
+ text-transform: none;
+}
+.rowitem:not(:last-child)
+{
+ border-bottom: 1px dotted #ccc;
+}
+.rowitem a
+{
+ text-decoration: none;
+ color: black;
+}
+.rowitem a:hover
+{
+ color: silver;
+}
+
+.col_left
+{
+ width: 30%;
+ float: left;
+}
+.col_right
+{
+ width: 69%;
+ overflow: hidden;
+}
+.colitem
+{
+ padding-left: 8px;
+ padding-right: 8px;
+ padding-top: 17px;
+ padding-bottom: 12px;
+ font-weight: bold;
+ text-transform: uppercase;
+}
+.colitem.passive
+{
+ font-weight: normal;
+ text-transform: none;
+}
+.colitem a
+{
+ text-decoration: none;
+ color: black;
+}
+.colitem a:hover
+{
+ color: silver;
+}
+
+.formrow
+{
+ /*height: 40px;*/
+ width: 100%;
+}
+
+/*Clearfix*/
+.formrow:before,
+.formrow:after {
+ content: " ";
+ display: table;
+}
+
+.formrow:after {
+ clear: both;
+}
+
+.formrow:not(:last-child)
+{
+ border-bottom: 1px dotted #ccc;
+}
+
+.formitem
+{
+ float: left;
+ padding-left: 8px;
+ padding-right: 8px;
+ padding-top: 13px;
+ padding-bottom: 8px;
+ font-weight: bold;
+}
+
+.formitem:first-child
+{
+ font-weight: bold;
+}
+
+.formitem:not(:last-child)
+{
+ border-right: 1px dotted #ccc;
+}
+
+.formitem.invisible_border
+{
+ border: none;
+}
+
+/* Mostly for textareas */
+.formitem:only-child
+{
+ width: 97%;
+}
+.formitem textarea
+{
+ width: 100%;
+ height: 100px;
+}
+.formitem:has-child()
+{
+ margin: 0 auto;
+ float: none;
+}
+
+button
+{
+ background: white;
+ border: 1px solid #8e8e8e;
+}
+
+/* Topics */
+.topic_status
+{
+ text-transform: none;
+ margin-left: 8px;
+ padding-left: 2px;
+ padding-right: 2px;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ background-color: #E8E8E8; /* 232,232,232. All three RGB colours being the same seems to create a shade of gray */
+ color: #505050; /* 80,80,80 */
+ border-radius: 2px;
+}
+
+.topic_status:empty
+{
+ display: none;
+}
+
+.username
+{
+ text-transform: none;
+ margin-left: 0px;
+ padding-left: 4px;
+ padding-right: 4px;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ color: #505050; /* 80,80,80 */
+ background-color: #FFFFFF;
+ border-style: dotted;
+ border-color: #505050; /* 232,232,232. All three RGB colours being the same seems to create a shade of gray */
+ border-width: 1px;
+ font-size: 15px;
+}
+button.username
+{
+ position: relative;
+ top: -0.25px;
+}
+.tag-mini
+{
+ text-transform: none;
+ margin-left: 0px;
+ padding-left: 3px;
+ padding-right: 3px;
+ padding-top: 1.5px;
+ padding-bottom: 0px;
+ color: #505050; /* 80,80,80 */
+ background-color: #FFFFFF;
+ border-style: dotted;
+ border-color: #505050; /* 232,232,232. All three RGB colours being the same seems to create a shade of gray */
+ border-width: 1px;
+ font-size: 10px;
+}
+
+.show_on_edit
+{
+ display: none;
+}
+
+.alert
+{
+ display: block;
+ padding: 5px;
+ margin-bottom: 10px;
+ border: 1px solid #ccc;
+}
+.alert_success
+{
+ display: block;
+ padding: 5px;
+ border: 1px solid A2FC00;
+ margin-bottom: 10px;
+ background-color: DAF7A6;
+}
+.alert_error
+{
+ display: block;
+ padding: 5px;
+ border: 1px solid #FF004B;
+ margin-bottom: 8px;
+ background-color: #FEB7CC;
+}
+
+@media (max-width: 880px) {
+ li
+ {
+ height: 25px;
+ font-size: 15px;
+ padding-left: 7px;
+ }
+ ul { height: 26px; margin-top: 8px; }
+ .menu_left { padding-right: 7px; }
+ .menu_right { padding-right: 7px; }
+ body { padding-left: 4px; padding-right: 4px; margin: 0px !important; width: 100% !important; height: 100% !important; overflow-x: hidden; }
+ .container { width: auto; }
+}
+
+@media (max-width: 810px) {
+ li
+ {
+ font-weight: normal;
+ text-transform: none;
+ }
+ .rowitem
+ {
+ text-transform: none;
+ }
+}
+
+@media (max-width: 620px) {
+ li
+ {
+ padding-left: 5px;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ height: 23px;
+ }
+ ul { height: 24px; }
+ .menu_left { padding-right: 5px; }
+ .menu_right { padding-right: 5px; }
+ .menu_create_topic { display: none;}
+ .hide_on_mobile { display: none; }
+}
+
+@media (max-width: 470px) {
+ .menu_overview { display: none; }
+ .menu_profile { display: none; }
+ .hide_on_micro { display: none; }
+ .post_container {
+ overflow: visible !important;
+ }
+ .post_item {
+ background-position: 0px 2px !important;
+ background-size: 64px 64px !important;
+ padding-left: 2px !important;
+ min-height: 96px;
+ position: relative !important;
+ }
+ .post_item > .user_content {
+ margin-left: 75px !important;
+ width: 100% !important;
+ }
+ .post_item > .mod_button {
+ float: right !important;
+ margin-left: 2px !important;
+ position: relative;
+ top: -14px;
+ }
+ .post_item > .real_username {
+ position: absolute;
+ top: 70px;
+ float: left;
+ margin-top: 0px;
+ padding-top: 3px !important;
+ margin-right: 2px;
+ width: 60px;
+ font-size: 15px;
+ }
+ .container { width: 100% !important; }
+}
\ No newline at end of file
diff --git a/themes/tempra-simple/theme.json b/themes/tempra-simple/theme.json
new file mode 100644
index 00000000..2257bbc3
--- /dev/null
+++ b/themes/tempra-simple/theme.json
@@ -0,0 +1,6 @@
+{
+ "Name": "tempra-simple",
+ "FriendlyName": "Tempra Simple",
+ "Version": "0.0.1",
+ "Creator": "Azareal"
+}
\ No newline at end of file