From dff8ce5b440b886f4810ce54510f2a774e8f2806 Mon Sep 17 00:00:00 2001
From: Teascade <teascade@gmail.com>
Date: Tue, 8 Nov 2016 11:28:59 +0200
Subject: [PATCH] Cleaned up a bit and added Saltosion page

---
 blog/index.html                               |  14 ++-
 blogtext/index.html                           |  14 ++-
 build.py                                      |  94 ++++++---------
 css/main.css.map                              |   4 +-
 games/index.html                              |  14 ++-
 index.html                                    |  14 ++-
 saltosion/index.html                          | 109 ++++++++++++++++++
 .../blogposts}/021116_2346_first.md           |   0
 .../blogposts}/060416_0000_bestyears.md       |   0
 .../blogposts}/060813_0000_creation.md        |   0
 .../blogposts}/060813_0000_meaningful.md      |   0
 .../blogposts}/160813_0000_absence.md         |   0
 .../blogposts}/161213_0000_longtime.md        |   0
 .../blogposts}/220913_0000_much.md            |   0
 .../blogposts}/230114_0000_january.md         |   0
 .../blogposts}/230114_0000_updates.md         |   0
 .../blogposts}/281016_0000_grand.md           |   0
 .../blogposts}/311015_0000_matrix.md          |   0
 .../blogposts}/blogposts.json                 |   0
 src/games.md                                  |   4 +-
 src/saltosion.md                              |  13 +++
 {scss => src/scss}/main.scss                  |   0
 src/template.html                             |   3 +
 {ts => src/ts}/main.ts                        |   0
 tsconfig.json                                 |   2 +-
 25 files changed, 214 insertions(+), 71 deletions(-)
 create mode 100644 saltosion/index.html
 rename {blogposts-md => src/blogposts}/021116_2346_first.md (100%)
 rename {blogposts-md => src/blogposts}/060416_0000_bestyears.md (100%)
 rename {blogposts-md => src/blogposts}/060813_0000_creation.md (100%)
 rename {blogposts-md => src/blogposts}/060813_0000_meaningful.md (100%)
 rename {blogposts-md => src/blogposts}/160813_0000_absence.md (100%)
 rename {blogposts-md => src/blogposts}/161213_0000_longtime.md (100%)
 rename {blogposts-md => src/blogposts}/220913_0000_much.md (100%)
 rename {blogposts-md => src/blogposts}/230114_0000_january.md (100%)
 rename {blogposts-md => src/blogposts}/230114_0000_updates.md (100%)
 rename {blogposts-md => src/blogposts}/281016_0000_grand.md (100%)
 rename {blogposts-md => src/blogposts}/311015_0000_matrix.md (100%)
 rename {blogposts-md => src/blogposts}/blogposts.json (100%)
 create mode 100644 src/saltosion.md
 rename {scss => src/scss}/main.scss (100%)
 rename {ts => src/ts}/main.ts (100%)

diff --git a/blog/index.html b/blog/index.html
index 56df812..92ae5ad 100644
--- a/blog/index.html
+++ b/blog/index.html
@@ -71,8 +71,8 @@ following things:</p>
                <h1>Games</h1>
 <p>I have a tonne of games none of which are released! You can check some of them from my <a href="https://github.com/teascade">github</a>.<br>
 Once I release them I'll make sure to post them here and on <a href="https://teascade.itch.io">my itch.io</a>!</p>
-<h2>Saltosion</h2>
-<p>I have this <a href="https://github.com/saltosion">organization</a> though, which I
+<h2><a class="js-link" href="/saltosion">Saltosion</a></h2>
+<p>I have this organization though (<a href="https://github.com/saltosion">See GitHub!</a>), which I
 sometimes use when collaborating games with other people.<br>
 The games made under this organization then are listed here (aswell with <a href="https://saltosion.itch.io">Saltosion's own itch.io</a>)</p>
 <p><iframe class="itch-embedded" frameborder="0" src="https://itch.io/embed/94673?linkback=true&amp;bg_color=222&amp;fg_color=fff&amp;link_color=ff0091&amp;border_color=303030" width="552" height="167"></iframe></p>
@@ -86,6 +86,16 @@ I'm awfully sorry though, I tried my best, but I couldn't implement a blog syste
 without it taking a butt-load of space and files while being Non-Javascript friendly.
 <p>So this means no blogs for you, M. No-Javascript!</p>
 </p></noscript>
+            </div>
+            <div id="saltosion" class="hiddenarea" >
+               <h1>Saltosion</h1>
+<p>Saltosion is an organization founded by me, <a class="js-link" href="/about">Teascade</a>
+which I sometimes use, when collaborating with other devs and making
+some art (and games sometimes)</p>
+<p>Saltosion also has a <a href="https://github.com/saltosion">GitHub</a> and an <a href="https://saltosion.itch.io">Itch.io</a> so check them out!</p>
+<p>Here's also all the games made by Saltosion!</p>
+<p><iframe class="itch-embedded" frameborder="0" src="https://itch.io/embed/94673?linkback=true&amp;bg_color=222&amp;fg_color=fff&amp;link_color=ff0091&amp;border_color=303030" width="552" height="167"></iframe>
+By <a class="js-link" href="/about">Teascade</a> and <a href="https://revolverpunk.itch.io">Revolverpunk</a></p>
             </div>
             <div id="blogtext" class="hiddenarea" >
                <noscript>
diff --git a/blogtext/index.html b/blogtext/index.html
index 32a3005..da0f8d3 100644
--- a/blogtext/index.html
+++ b/blogtext/index.html
@@ -71,8 +71,8 @@ following things:</p>
                <h1>Games</h1>
 <p>I have a tonne of games none of which are released! You can check some of them from my <a href="https://github.com/teascade">github</a>.<br>
 Once I release them I'll make sure to post them here and on <a href="https://teascade.itch.io">my itch.io</a>!</p>
-<h2>Saltosion</h2>
-<p>I have this <a href="https://github.com/saltosion">organization</a> though, which I
+<h2><a class="js-link" href="/saltosion">Saltosion</a></h2>
+<p>I have this organization though (<a href="https://github.com/saltosion">See GitHub!</a>), which I
 sometimes use when collaborating games with other people.<br>
 The games made under this organization then are listed here (aswell with <a href="https://saltosion.itch.io">Saltosion's own itch.io</a>)</p>
 <p><iframe class="itch-embedded" frameborder="0" src="https://itch.io/embed/94673?linkback=true&amp;bg_color=222&amp;fg_color=fff&amp;link_color=ff0091&amp;border_color=303030" width="552" height="167"></iframe></p>
@@ -86,6 +86,16 @@ I'm awfully sorry though, I tried my best, but I couldn't implement a blog syste
 without it taking a butt-load of space and files while being Non-Javascript friendly.
 <p>So this means no blogs for you, M. No-Javascript!</p>
 </p></noscript>
+            </div>
+            <div id="saltosion" class="hiddenarea" >
+               <h1>Saltosion</h1>
+<p>Saltosion is an organization founded by me, <a class="js-link" href="/about">Teascade</a>
+which I sometimes use, when collaborating with other devs and making
+some art (and games sometimes)</p>
+<p>Saltosion also has a <a href="https://github.com/saltosion">GitHub</a> and an <a href="https://saltosion.itch.io">Itch.io</a> so check them out!</p>
+<p>Here's also all the games made by Saltosion!</p>
+<p><iframe class="itch-embedded" frameborder="0" src="https://itch.io/embed/94673?linkback=true&amp;bg_color=222&amp;fg_color=fff&amp;link_color=ff0091&amp;border_color=303030" width="552" height="167"></iframe>
+By <a class="js-link" href="/about">Teascade</a> and <a href="https://revolverpunk.itch.io">Revolverpunk</a></p>
             </div>
             <div id="blogtext"  >
                <noscript>
diff --git a/build.py b/build.py
index 07dcad7..c3ac77f 100644
--- a/build.py
+++ b/build.py
@@ -10,77 +10,53 @@ def generate_template():
     content = content_file.read()
     content_file.close()
 
-    about_file = open('src/about.md', 'r', encoding="utf-8")
-    about = about_file.read()
-    about_file.close()
+    md_list = glob.glob("src/*.md")
 
-    games_file = open('src/games.md', 'r', encoding="utf-8")
-    games = games_file.read()
-    games_file.close()
+    for md in md_list:
+        f = open(md, 'r', encoding="utf-8")
+        file_content = f.read()
+        f.close()
 
-    blog_file = open('src/blog.md', 'r', encoding="utf-8")
-    blog = blog_file.read()
-    blog_file.close()
-
-    content = content.replace("$about_content$", markdown.markdown(about, output_format="html5"))
-    content = content.replace("$games_content$", markdown.markdown(games, output_format="html5"))
-    content = content.replace("$blog_content$", markdown.markdown(blog, output_format="html5"))
+        name = md[4:][:len(md)-7]
+        content = content.replace("$" + name + "_content$", markdown.markdown(file_content, output_format="html5"))
 
     return content
 
 def generate_page(template, page):
     content = template.replace("$page$", page);
 
-    rel_about = "/"
-    rel_games = "/games"
-    rel_blog = "/blog"
+    rel = {
+        "about": "/",
+        "games": "/games",
+        "blog": "/blog",
+        "saltosion": "/saltosion",
+        "blogtext": "/"
+    }
 
-    about_class = 'class="hiddenarea"'
-    games_class = 'class="hiddenarea"'
-    blog_class = 'class="hiddenarea"'
-    blogtext_class = 'class="hiddenarea"'
-    about_btn_class = ''
-    games_btn_class = ''
-    blog_btn_class = ''
+    md_list = glob.glob("src/*.md")
+    md_list.append("blogtext")
 
-    if (page == "about"):
-        rel_about = "#"
-        about_class = ""
-        about_btn_class = 'class="active"'
-    elif (page == "games"):
-        rel_games = "#"
-        games_class = ""
-        games_btn_class = 'class="active"'
-    elif (page == "blog"):
-        rel_blog = "#"
-        blog_class = ""
-        blog_btn_class = 'class="active"'
-    elif (page == "blogtext"):
-        rel_blogtext = "#"
-        blogtext_class = ""
+    for md in md_list:
+        name = md.split("src/")[-1].split(".md")[0]
+        if page != name:
+            content = content.replace("$relative_" + name + "$", rel[name])
+            content = content.replace("$" + name + "_class$", 'class="hiddenarea"')
+            content = content.replace("$" + name + "_btn_class$", '')
+        else:
+            content = content.replace("$relative_" + name + "$", "#")
+            content = content.replace("$" + name + "_class$", "")
+            content = content.replace("$" + name + "_btn_class$", 'class="active"')
 
-    content = content.replace("$relative_about$", rel_about);
-    content = content.replace("$relative_games$", rel_games);
-    content = content.replace("$relative_blog$", rel_blog);
-
-    content = content.replace("$about_class$", about_class);
-    content = content.replace("$games_class$", games_class);
-    content = content.replace("$blog_class$", blog_class);
-    content = content.replace("$blogtext_class$", blogtext_class);
-
-    content = content.replace("$about_btn_class$", about_btn_class);
-    content = content.replace("$games_btn_class$", games_btn_class);
-    content = content.replace("$blog_btn_class$", blog_btn_class);
     return content;
 
 def build_blogposts():
-    blogposts = glob.glob("blogposts-md/*.md")
+    blogposts = glob.glob("src/blogposts/*.md")
     for path in blogposts:
         with open(path, "r", encoding="utf-8") as f:
-            with open(path.replace("blogposts-md", "blogposts").replace(".md", ".html"), "w+", encoding="utf-8") as f2:
+            with open(path.replace("src/blogposts", "blogposts").replace(".md", ".html"), "w+", encoding="utf-8") as f2:
                 f2.write(markdown.markdown(f.read(), output_format="html5"))
 
-    with open("blogposts-md/blogposts.json", "r", encoding="utf-8") as f:
+    with open("src/blogposts/blogposts.json", "r", encoding="utf-8") as f:
         with open("blogposts/blogposts.json", "w+", encoding="utf-8") as f2:
             f2.write("window.blogpostDataStr = '" + f.read().replace("\n", "") + "';")
 
@@ -112,7 +88,6 @@ def apply_custom_markdown(markdown):
     return markdown
 
 def generate():
-    #md = markdown.markdown("hi **this is** a test markdown _right?_ `wait, let's test _the *code* block_`", output_format="html5")
     print("Building blogposts..")
     build_blogposts()
     print("Done!\n")
@@ -130,16 +105,19 @@ def generate():
     print("Generating pages..")
     with open('index.html', 'w+', encoding="utf-8") as f:
         f.write(generate_page(template, "about"))
-        print("About (index.html) done!")
+        print("  About (index.html) done!")
     with open('games/index.html', 'w+', encoding="utf-8") as f:
         f.write(generate_page(template, "games"))
-        print("Games done!")
+        print("  Games done!")
     with open('blog/index.html', 'w+', encoding="utf-8") as f:
         f.write(generate_page(template, "blog"))
-        print("Blog done!")
+        print("  Blog done!")
     with open('blogtext/index.html', 'w+', encoding="utf-8") as f:
         f.write(generate_page(template, "blogtext"))
-        print("Blogtext done!")
+        print("  Blogtext done!")
+    with open('saltosion/index.html', 'w+', encoding="utf-8") as f:
+        f.write(generate_page(template, "saltosion"))
+        print("  Saltosion done!")
 
     print("Done!\n")
 
diff --git a/css/main.css.map b/css/main.css.map
index 35196fe..852cc5d 100644
--- a/css/main.css.map
+++ b/css/main.css.map
@@ -1,7 +1,7 @@
 {
 "version": 3,
 "mappings": "AAIA,UAAW;EACR,gBAAgB,EAHZ,OAAO;EAIX,WAAW,EAAE,qBAAqB;EAClC,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;;AAGb,yBAA0B;EACvB,KAAM;IACH,OAAO,EAAE,gBAAgB;IACzB,KAAK,EAAE,IAAI;IAEX,aAAQ;MACL,MAAM,EAAE,eAAe;MAEvB,iBAAI;QACD,YAAY,EAAE,GAAG;QACjB,KAAK,EAAE,cAAc;QACrB,MAAM,EAAE,eAAe;QACvB,WAAW,EAAE,GAAG;QAChB,cAAc,EAAE,GAAG;IAIzB,gBAAW;MACR,WAAW,EAAE,GAAG;MAChB,aAAa,EAAE,YAAY;MAC3B,KAAK,EAAE,cAAc;MACrB,MAAM,EAAE,eAAe;MAEvB,0BAAU;QACP,OAAO,EAAE,YAAY;QACrB,YAAY,EAAE,gBAAgB;AAM1C,KAAM;EACH,OAAO,EAAE,WAAW;EACpB,cAAc,EAAE,GAAG;EACnB,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EAEZ,aAAQ;IACL,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE,MAAM;IAClB,OAAO,EAAC,IAAI;IACZ,eAAe,EAAC,MAAM;IACtB,WAAW,EAAC,MAAM;IAClB,gBAAgB,EAAE,OAAe;IAEjC,iBAAI;MACD,KAAK,EAAE,GAAG;MACV,UAAU,EAAE,IAAI;MAChB,MAAM,EAAE,IAAI;EAKlB,gBAAW;IACR,KAAK,EAAE,GAAG;IACV,MAAM,EAAE,IAAI;IACZ,YAAY,EAAE,EAAE;IAChB,aAAa,EAAE,EAAE;IACjB,aAAa,EAAE,GAAG;IAClB,UAAU,EAAE,IAAI;IAEhB,4BAAY;MACT,UAAU,EAAE,MAAM;MAClB,MAAM,EAAE,CAAC;MACT,KAAK,EAAE,CAAC;MACR,QAAQ,EAAE,MAAM;MAChB,MAAM,EAAE,CAAC;MACT,OAAO,EAAE,CAAC;IAGb,oBAAI;MACD,MAAM,EAAE,CAAC;MACT,OAAO,EAAE,CAAC;MACV,cAAc,EAAE,GAAG;IAKnB,mBAAO;MACJ,MAAM,EAAE,CAAC;MACT,KAAK,EA9FV,OAAO;IA4FL,mBAAO;MACJ,MAAM,EAAE,CAAC;MACT,KAAK,EA9FV,OAAO;IA4FL,mBAAO;MACJ,MAAM,EAAE,CAAC;MACT,KAAK,EA9FV,OAAO;IA4FL,mBAAO;MACJ,MAAM,EAAE,CAAC;MACT,KAAK,EA9FV,OAAO;IA4FL,mBAAO;MACJ,MAAM,EAAE,CAAC;MACT,KAAK,EA9FV,OAAO;IA4FL,mBAAO;MACJ,MAAM,EAAE,CAAC;MACT,KAAK,EA9FV,OAAO;IAkGR,6BAAa;MACV,OAAO,EAAE,KAAK;MACd,KAAK,EApGP,OAAO;MAqGL,UAAU,EAAE,IAAI;MAChB,MAAM,EAAE,CAAC;IAGZ,mCAAmB;MAChB,MAAM,EAAE,OAAO;MACf,gBAAgB,EAAE,OAAe;MACjC,UAAU,EAAE,IAAI;IAGnB,kBAAE;MACC,KAAK,EAhHP,OAAO;IAmHR,2BAAW;MACR,KAAK,EAAE,OAAY;MACnB,cAAc,EAAE,MAAM;MACtB,SAAS,EAAE,IAAI;IAGlB,kBAAE;MACC,KAAK,EAzHJ,IAAI;IA4HR,mBAAG;MACA,KAAK,EA7HJ,IAAI;IAgIR,0BAAU;MAEP,YAAY,EAAE,GAAG;MACjB,UAAU,EAAE,IAAI;MAChB,WAAW,EAAE,MAAM;MACnB,cAAc,EAAE,GAAG;MAEnB,kCAAQ;QACL,OAAO,EAAE,IAAI;QACb,UAAU,EAAE,IAAI;QAChB,MAAM,EAAE,IAAI;MAGf,6BAAG;QACA,OAAO,EAAE,YAAY;QACrB,OAAO,EAAE,KAAK;QACd,gBAAgB,EA/IrB,OAAO;QAgJF,MAAM,EAAE,IAAI;QACZ,UAAU,EAAE,IAAI;QAChB,KAAK,EAAE,OAAe;QACtB,YAAY,EAAE,iBAAsB;QACpC,SAAS,EAAE,aAAa;QAExB,qCAAQ;UACL,SAAS,EAAE,YAAY;MAG7B,2CAAiB;QACd,WAAW,EAAE,iBAAsB;MAEtC,mCAAS;QACN,gBAAgB,EAAE,OAAY;QAC9B,UAAU,EAAE,IAAI;QAChB,MAAM,EAAE,OAAO;MAGlB,oCAAU;QACP,gBAAgB,EAAE,OAAe;MAGpC,0CAAgB;QACb,gBAAgB,EAAE,OAAsB;IAI9C,qCAAqB;MAClB,KAAK,EAAE,IAAI;MACX,SAAS,EAAE,KAAK;IAGnB,yBAAS;MACN,eAAe,EAAE,SAAS;IAG7B,+BAAe;MACZ,MAAM,EAAE,OAAO;;AAKxB,QAAS;EACN,KAAK,EA7LE,IAAI",
-"sources": ["../scss/main.scss"],
+"sources": ["../src/scss/main.scss"],
 "names": [],
 "file": "main.css"
-}
\ No newline at end of file
+}
diff --git a/games/index.html b/games/index.html
index e0b77f8..2834af4 100644
--- a/games/index.html
+++ b/games/index.html
@@ -71,8 +71,8 @@ following things:</p>
                <h1>Games</h1>
 <p>I have a tonne of games none of which are released! You can check some of them from my <a href="https://github.com/teascade">github</a>.<br>
 Once I release them I'll make sure to post them here and on <a href="https://teascade.itch.io">my itch.io</a>!</p>
-<h2>Saltosion</h2>
-<p>I have this <a href="https://github.com/saltosion">organization</a> though, which I
+<h2><a class="js-link" href="/saltosion">Saltosion</a></h2>
+<p>I have this organization though (<a href="https://github.com/saltosion">See GitHub!</a>), which I
 sometimes use when collaborating games with other people.<br>
 The games made under this organization then are listed here (aswell with <a href="https://saltosion.itch.io">Saltosion's own itch.io</a>)</p>
 <p><iframe class="itch-embedded" frameborder="0" src="https://itch.io/embed/94673?linkback=true&amp;bg_color=222&amp;fg_color=fff&amp;link_color=ff0091&amp;border_color=303030" width="552" height="167"></iframe></p>
@@ -86,6 +86,16 @@ I'm awfully sorry though, I tried my best, but I couldn't implement a blog syste
 without it taking a butt-load of space and files while being Non-Javascript friendly.
 <p>So this means no blogs for you, M. No-Javascript!</p>
 </p></noscript>
+            </div>
+            <div id="saltosion" class="hiddenarea" >
+               <h1>Saltosion</h1>
+<p>Saltosion is an organization founded by me, <a class="js-link" href="/about">Teascade</a>
+which I sometimes use, when collaborating with other devs and making
+some art (and games sometimes)</p>
+<p>Saltosion also has a <a href="https://github.com/saltosion">GitHub</a> and an <a href="https://saltosion.itch.io">Itch.io</a> so check them out!</p>
+<p>Here's also all the games made by Saltosion!</p>
+<p><iframe class="itch-embedded" frameborder="0" src="https://itch.io/embed/94673?linkback=true&amp;bg_color=222&amp;fg_color=fff&amp;link_color=ff0091&amp;border_color=303030" width="552" height="167"></iframe>
+By <a class="js-link" href="/about">Teascade</a> and <a href="https://revolverpunk.itch.io">Revolverpunk</a></p>
             </div>
             <div id="blogtext" class="hiddenarea" >
                <noscript>
diff --git a/index.html b/index.html
index 6eeec53..ea9bc6d 100644
--- a/index.html
+++ b/index.html
@@ -71,8 +71,8 @@ following things:</p>
                <h1>Games</h1>
 <p>I have a tonne of games none of which are released! You can check some of them from my <a href="https://github.com/teascade">github</a>.<br>
 Once I release them I'll make sure to post them here and on <a href="https://teascade.itch.io">my itch.io</a>!</p>
-<h2>Saltosion</h2>
-<p>I have this <a href="https://github.com/saltosion">organization</a> though, which I
+<h2><a class="js-link" href="/saltosion">Saltosion</a></h2>
+<p>I have this organization though (<a href="https://github.com/saltosion">See GitHub!</a>), which I
 sometimes use when collaborating games with other people.<br>
 The games made under this organization then are listed here (aswell with <a href="https://saltosion.itch.io">Saltosion's own itch.io</a>)</p>
 <p><iframe class="itch-embedded" frameborder="0" src="https://itch.io/embed/94673?linkback=true&amp;bg_color=222&amp;fg_color=fff&amp;link_color=ff0091&amp;border_color=303030" width="552" height="167"></iframe></p>
@@ -86,6 +86,16 @@ I'm awfully sorry though, I tried my best, but I couldn't implement a blog syste
 without it taking a butt-load of space and files while being Non-Javascript friendly.
 <p>So this means no blogs for you, M. No-Javascript!</p>
 </p></noscript>
+            </div>
+            <div id="saltosion" class="hiddenarea" >
+               <h1>Saltosion</h1>
+<p>Saltosion is an organization founded by me, <a class="js-link" href="/about">Teascade</a>
+which I sometimes use, when collaborating with other devs and making
+some art (and games sometimes)</p>
+<p>Saltosion also has a <a href="https://github.com/saltosion">GitHub</a> and an <a href="https://saltosion.itch.io">Itch.io</a> so check them out!</p>
+<p>Here's also all the games made by Saltosion!</p>
+<p><iframe class="itch-embedded" frameborder="0" src="https://itch.io/embed/94673?linkback=true&amp;bg_color=222&amp;fg_color=fff&amp;link_color=ff0091&amp;border_color=303030" width="552" height="167"></iframe>
+By <a class="js-link" href="/about">Teascade</a> and <a href="https://revolverpunk.itch.io">Revolverpunk</a></p>
             </div>
             <div id="blogtext" class="hiddenarea" >
                <noscript>
diff --git a/saltosion/index.html b/saltosion/index.html
new file mode 100644
index 0000000..ea7c94d
--- /dev/null
+++ b/saltosion/index.html
@@ -0,0 +1,109 @@
+<!DOCTYPE html>
+<html>
+   <head>
+      <meta name="viewport" content="width=device-width, initial-scale=1">
+      <meta name="robots" content="all">
+      <meta name="description" content="Game dev, artist and a philosopher featuring very bad jokes.">
+      <meta charset="utf-8">
+      <meta name="google-site-verification" content="xMTesqfhCjQW48l2C5bOqYK6HsOXJORfF4gW_tkjBMo" />
+
+      <meta property="og:title" content="Teascade | saltosion">
+      <meta property="og:site_name" content="Teascade">
+      <meta name="title" content="Teascade">
+
+      <meta property="og:type" content="website">
+      <meta property="og:description" content="Game dev, artist and a philosopher featuring very bad jokes.">
+      <meta property="og:image" content="http://teasca.de/favicon.png">
+      <meta property="og:image:secure_url" content="http://teasca.de/favicon.png">
+      <meta property="og:image:type" content="image/png">
+      <meta property="og:image:width" content="512">
+      <meta property="og:image:height" content="512">
+
+      <meta name="twitter:site" content="@teascade">
+      <meta name="twitter:creator" content="@teascade">
+      <meta name="twitter:title" content="Teascade | saltosion">
+      <meta name="twitter:description" content="Game dev, artist and a philosopher featuring very bad jokes.">
+      <meta name="twitter:image" content="http://teasca.de/favicon.png">
+
+      <link rel="stylesheet" href="/css/main.css">
+      <script type="text/javascript" src="/blogposts/blogposts.json"></script>
+      <script type="text/javascript" src="/js/main.js"></script>
+
+      <link rel="shortcut icon" href="favicon.png"></link>
+
+      <title>Teascade | saltosion</title>
+   </head>
+   <body onload="main('saltosion')">
+      <div class="cont">
+         <div class="teacup">
+            <img src="/img/teascade_cropped.svg"></img>
+         </div>
+
+         <div class="stuffarea">
+            <ul class="navbar">
+               <a href="/" id="about-link"><li ><div class="button">About</div></li></a>
+               <a href="/games" id="games-link"><li ><div class="button">Games</div></li></a>
+               <a href="/blog" id="blog-link"><li ><div class="button">Blog</div></li></a>
+            </ul>
+            <div id="about" class="hiddenarea" >
+               <h1>Teascade</h1>
+<p>I'm a boring person, but in a desperate attempt to make you interested in me, I'm going to to tell you a few things I am;</p>
+<ul>
+<li>Game dev</li>
+<li>Artist</li>
+<li>Philosopher</li>
+</ul>
+<p>And a few things I am not;</p>
+<ul>
+<li><em>A normal person</em></li>
+</ul>
+<p>Assuming I've <em>totally</em> caught your interest (for now at least), how about you check out <a class="js-link" href="/games">my games</a>,
+<a class="js-link" href="/blog">my blog</a>, and if you want to get <strong>really</strong> invested, you should check out some of the
+following things:</p>
+<ul>
+<li><a href="https://github.com/teascade">GitHub (Teascade)</a></li>
+<li><a href="https://twitter.com/teascade">Twitter (@Teascade)</a></li>
+<li><a href="https://reddit.com/u/teascade">Reddit (not very active, /u/teascade)</a></li>
+</ul>
+<p>And if you have a really desperate urge to contact me, you may try to email me at <a href="mailto:teascade@gmail.com">teascade@gmail.com</a></p>
+            </div>
+            <div id="games" class="hiddenarea" >
+               <h1>Games</h1>
+<p>I have a tonne of games none of which are released! You can check some of them from my <a href="https://github.com/teascade">github</a>.<br>
+Once I release them I'll make sure to post them here and on <a href="https://teascade.itch.io">my itch.io</a>!</p>
+<h2><a class="js-link" href="/saltosion">Saltosion</a></h2>
+<p>I have this organization though (<a href="https://github.com/saltosion">See GitHub!</a>), which I
+sometimes use when collaborating games with other people.<br>
+The games made under this organization then are listed here (aswell with <a href="https://saltosion.itch.io">Saltosion's own itch.io</a>)</p>
+<p><iframe class="itch-embedded" frameborder="0" src="https://itch.io/embed/94673?linkback=true&amp;bg_color=222&amp;fg_color=fff&amp;link_color=ff0091&amp;border_color=303030" width="552" height="167"></iframe></p>
+            </div>
+            <div id="blog" class="hiddenarea" >
+               <h1>Blog</h1>
+<p>Welcome to my weird and messy blog!<br>
+Also remember to check out my Twitter <a href="https://twitter.com/teascade">@Teascade</a></p>
+<noscript><p>
+I'm awfully sorry though, I tried my best, but I couldn't implement a blog system
+without it taking a butt-load of space and files while being Non-Javascript friendly.
+<p>So this means no blogs for you, M. No-Javascript!</p>
+</p></noscript>
+            </div>
+            <div id="saltosion"  >
+               <h1>Saltosion</h1>
+<p>Saltosion is an organization founded by me, <a class="js-link" href="/about">Teascade</a>
+which I sometimes use, when collaborating with other devs and making
+some art (and games sometimes)</p>
+<p>Saltosion also has a <a href="https://github.com/saltosion">GitHub</a> and an <a href="https://saltosion.itch.io">Itch.io</a> so check them out!</p>
+<p>Here's also all the games made by Saltosion!</p>
+<p><iframe class="itch-embedded" frameborder="0" src="https://itch.io/embed/94673?linkback=true&amp;bg_color=222&amp;fg_color=fff&amp;link_color=ff0091&amp;border_color=303030" width="552" height="167"></iframe>
+By <a class="js-link" href="/about">Teascade</a> and <a href="https://revolverpunk.itch.io">Revolverpunk</a></p>
+            </div>
+            <div id="blogtext" class="hiddenarea" >
+               <noscript>
+                  <p>Oh sorry, it looks like someone sent you a link to a blogtext (or something), but you don't have javascript enabled!</p>
+                  <p>Sorry to be the one to break the bad news for you, but we don't take javascript-absolutists kindly this 'round 'o town. So if you could kindly just press that "About" button and forget this ever happened, yeah?</p>
+               </noscript>
+            </div>
+         </div>
+      </div>
+   </body>
+</html>
diff --git a/blogposts-md/021116_2346_first.md b/src/blogposts/021116_2346_first.md
similarity index 100%
rename from blogposts-md/021116_2346_first.md
rename to src/blogposts/021116_2346_first.md
diff --git a/blogposts-md/060416_0000_bestyears.md b/src/blogposts/060416_0000_bestyears.md
similarity index 100%
rename from blogposts-md/060416_0000_bestyears.md
rename to src/blogposts/060416_0000_bestyears.md
diff --git a/blogposts-md/060813_0000_creation.md b/src/blogposts/060813_0000_creation.md
similarity index 100%
rename from blogposts-md/060813_0000_creation.md
rename to src/blogposts/060813_0000_creation.md
diff --git a/blogposts-md/060813_0000_meaningful.md b/src/blogposts/060813_0000_meaningful.md
similarity index 100%
rename from blogposts-md/060813_0000_meaningful.md
rename to src/blogposts/060813_0000_meaningful.md
diff --git a/blogposts-md/160813_0000_absence.md b/src/blogposts/160813_0000_absence.md
similarity index 100%
rename from blogposts-md/160813_0000_absence.md
rename to src/blogposts/160813_0000_absence.md
diff --git a/blogposts-md/161213_0000_longtime.md b/src/blogposts/161213_0000_longtime.md
similarity index 100%
rename from blogposts-md/161213_0000_longtime.md
rename to src/blogposts/161213_0000_longtime.md
diff --git a/blogposts-md/220913_0000_much.md b/src/blogposts/220913_0000_much.md
similarity index 100%
rename from blogposts-md/220913_0000_much.md
rename to src/blogposts/220913_0000_much.md
diff --git a/blogposts-md/230114_0000_january.md b/src/blogposts/230114_0000_january.md
similarity index 100%
rename from blogposts-md/230114_0000_january.md
rename to src/blogposts/230114_0000_january.md
diff --git a/blogposts-md/230114_0000_updates.md b/src/blogposts/230114_0000_updates.md
similarity index 100%
rename from blogposts-md/230114_0000_updates.md
rename to src/blogposts/230114_0000_updates.md
diff --git a/blogposts-md/281016_0000_grand.md b/src/blogposts/281016_0000_grand.md
similarity index 100%
rename from blogposts-md/281016_0000_grand.md
rename to src/blogposts/281016_0000_grand.md
diff --git a/blogposts-md/311015_0000_matrix.md b/src/blogposts/311015_0000_matrix.md
similarity index 100%
rename from blogposts-md/311015_0000_matrix.md
rename to src/blogposts/311015_0000_matrix.md
diff --git a/blogposts-md/blogposts.json b/src/blogposts/blogposts.json
similarity index 100%
rename from blogposts-md/blogposts.json
rename to src/blogposts/blogposts.json
diff --git a/src/games.md b/src/games.md
index 017caf5..14ce83b 100644
--- a/src/games.md
+++ b/src/games.md
@@ -4,9 +4,9 @@ Games
 I have a tonne of games none of which are released! You can check some of them from my [github](https://github.com/teascade).  
 Once I release them I'll make sure to post them here and on [my itch.io](https://teascade.itch.io)!
 
-## Saltosion
+## [Saltosion]$(/saltosion)
 
-I have this [organization](https://github.com/saltosion) though, which I
+I have this organization though ([See GitHub!](https://github.com/saltosion)), which I
 sometimes use when collaborating games with other people.  
 The games made under this organization then are listed here (aswell with [Saltosion's own itch.io](https://saltosion.itch.io))
 
diff --git a/src/saltosion.md b/src/saltosion.md
new file mode 100644
index 0000000..d095751
--- /dev/null
+++ b/src/saltosion.md
@@ -0,0 +1,13 @@
+
+# Saltosion
+
+Saltosion is an organization founded by me, [Teascade]$(/about)
+which I sometimes use, when collaborating with other devs and making
+some art (and games sometimes)
+
+Saltosion also has a [GitHub](https://github.com/saltosion) and an [Itch.io](https://saltosion.itch.io) so check them out!
+
+Here's also all the games made by Saltosion!
+
+[itch$94673]
+By [Teascade]$(/about) and [Revolverpunk](https://revolverpunk.itch.io)
diff --git a/scss/main.scss b/src/scss/main.scss
similarity index 100%
rename from scss/main.scss
rename to src/scss/main.scss
diff --git a/src/template.html b/src/template.html
index 7a1be7e..e760b29 100644
--- a/src/template.html
+++ b/src/template.html
@@ -54,6 +54,9 @@
             <div id="blog" $blog_class$ >
                $blog_content$
             </div>
+            <div id="saltosion" $saltosion_class$ >
+               $saltosion_content$
+            </div>
             <div id="blogtext" $blogtext_class$ >
                <noscript>
                   <p>Oh sorry, it looks like someone sent you a link to a blogtext (or something), but you don't have javascript enabled!</p>
diff --git a/ts/main.ts b/src/ts/main.ts
similarity index 100%
rename from ts/main.ts
rename to src/ts/main.ts
diff --git a/tsconfig.json b/tsconfig.json
index 20ab379..35a6e65 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-        "rootDir": "ts",
+        "rootDir": "src/ts",
         "outDir": "js",
         "module": "commonjs",
         "target": "es5",