diff --git a/generate/end.html b/generate/end.html
deleted file mode 100644
index e1cda8c..0000000
--- a/generate/end.html
+++ /dev/null
@@ -1,21 +0,0 @@
-            </ul>
-
-            <br>
-            <t>Services:</t>
-            <ul id="services">
-                <li><d tabindex="0">Site hosting</d><p>You can host your own static website on the tilde! And be on this landing page!</p></li>
-                <li><d tabindex="0">Matrix</d><p>We have our own matrix homeserver!<br><br>We also have a very active room where we chat about silly stuff :3</p></li>
-                <li><a href="https://mail.linuxposting.xyz">Email</a><p>your-name@linuxposting.xyz. You want it, don't you?<br><br>Works with basically any email client, we also have <a href="https://mail.linuxposting.xyz">a webmail</a></p></li>
-                <li><a href="https://w.linuxposting.xyz">Wafrn</a><p>Linuxposting-themed fedi instance! For all your linuxposting needs</p></li>
-                <li><a href="https://git.linuxposting.xyz">Git</a><p>We have our own git forge! Very free and open source. Software.</p></li>
-                <li><a href="https://copy.tilde.linuxposting.xyz">Copyparty</a><p>File hosting! So convenient! Even guests can browse :3</p></li>
-                <li><a href="https://cinny.linuxposting.xyz">Cinny</a><p>The good matrix client</p></li>
-                <li><a href="https://element.linuxposting.xyz">Element</a><p>The bad matrix client. But it has LaTeX, in case you're into that.</p></li>
-            </ul>
-        </main><div><span class="title2">Description</span></div></div>
-        <div class="js skip"><div></div></div>
-        <span class="credit skip"><a href="https://girlkissing.tips" id="credit">site by Magdalunaa :3</a></span>
-        <span class="skip-notice skip">Click / space to skip</span>
-    </body>
-    <script src="/assets/main.js"></script>
-</html>
\ No newline at end of file
diff --git a/generate/start.html b/generate/index.html.template
similarity index 57%
rename from generate/start.html
rename to generate/index.html.template
index 5462148..5f981f5 100644
--- a/generate/start.html
+++ b/generate/index.html.template
@@ -43,4 +43,25 @@
             <br>
             <t>Users:</t>
             <ul id="users">
-                
\ No newline at end of file
+            <!--USERS-->
+            </ul>
+
+            <br>
+            <t>Services:</t>
+            <ul id="services">
+                <li><d tabindex="0">Site hosting</d><p>You can host your own static website on the tilde! And be on this landing page!</p></li>
+                <li><d tabindex="0">Matrix</d><p>We have our own matrix homeserver!<br><br>We also have a very active room where we chat about silly stuff :3</p></li>
+                <li><a href="https://mail.linuxposting.xyz">Email</a><p>your-name@linuxposting.xyz. You want it, don't you?<br><br>Works with basically any email client, we also have <a href="https://mail.linuxposting.xyz">a webmail</a></p></li>
+                <li><a href="https://w.linuxposting.xyz">Wafrn</a><p>Linuxposting-themed fedi instance! For all your linuxposting needs</p></li>
+                <li><a href="https://git.linuxposting.xyz">Git</a><p>We have our own git forge! Very free and open source. Software.</p></li>
+                <li><a href="https://copy.tilde.linuxposting.xyz">Copyparty</a><p>File hosting! So convenient! Even guests can browse :3</p></li>
+                <li><a href="https://cinny.linuxposting.xyz">Cinny</a><p>The good matrix client</p></li>
+                <li><a href="https://element.linuxposting.xyz">Element</a><p>The bad matrix client. But it has LaTeX, in case you're into that.</p></li>
+            </ul>
+        </main><div><span class="title2">Description</span></div></div>
+        <div class="js skip"><div></div></div>
+        <span class="credit skip"><a href="https://girlkissing.tips" id="credit">site by Magdalunaa :3</a></span>
+        <span class="skip-notice skip">Click / space to skip</span>
+    </body>
+    <script src="/assets/main.js"></script>
+</html>
\ No newline at end of file
diff --git a/generate/make-site.sh b/generate/make-site.sh
index 0edfff4..459ad6e 100755
--- a/generate/make-site.sh
+++ b/generate/make-site.sh
@@ -5,9 +5,6 @@ cd /var/lib/caddy/tilde/generate/
 rm ../index.html
 
 descs=$(./genuserdescs.scm)
+template=$(cat index.html.template)
 
-echo "$descs" > users.html
-
-cat start.html users.html end.html > ../index.html
-
-rm users.html
\ No newline at end of file
+echo "$template" | sed "s/<!--USERS-->[\s\S]*/$descs/" > ../index.html
\ No newline at end of file