diff --git a/templates/index.stpl b/templates/index.stpl
index 6ec9f32..c77fa8f 100644
--- a/templates/index.stpl
+++ b/templates/index.stpl
@@ -3,35 +3,33 @@
     <head>
         <title>zettoIT ARS</title>
         <meta charset="UTF-8">
-        <link rel="stylesheet" href="/static/pico.min.css">
+        <link rel="stylesheet" href="/static/zettoit-style/zettoit.css">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
     </head>
     <body>
         <main class="container">
-            <p>zettoIT ARS is a lightweight open source audience response system built with rust.</p>
+            <p><b>zettoIT ARS</b> is a lightweight open source audience response system built with rust.</p>
             <p>A quiz can be created by uploading a toml-encoded Quizfile. A basic example is listed below:</p>
-            <code style="width: 100%">
-                # number of seconds to wait before showing results<br/>
-                wait_for = 15<br/>
-                <br/>
-                [[questions]]<br/>
-                # type of the question (currently only single_choice)<br/>
-                type = "single_choice"<br/>
-                # name of the question<br/>
-                name = "Who is there?"<br/>
-                # array of possible answers<br/>
-                answers = [ "A", "B", "C", "D"]<br/>
-                # index (starting at 0) of the correct answer<br/>
-                correct = 0<br/>
-                <br/>
-                [[questions]]<br/>
-                type = "single_choice"<br/>
-                name = "What is there?"<br/>
-                answers = [ "A", "B", "C", "D"]<br/>
-                correct = 0<br/>
-            </code>
+            <pre>
+# number of seconds to wait before showing results
+wait_for = 15
 
-            <hr/>
+[[questions]]
+# type of the question (currently only single_choice)
+type = "single_choice"
+# name of the question
+name = "Who is there?"
+# array of possible answers
+answers = [ "A", "B", "C", "D"]
+# index (starting at 0) of the correct answer
+correct = 0
+
+[[questions]]
+type = "single_choice"
+name = "What is there?"
+answers = [ "A", "B", "C", "D"]
+correct = 0
+            </pre>
 
             <span id="error" style="color: red;"></span>
             <form method="post" hx-post="" hx-target="#error" hx-swap="innerHTML" enctype="multipart/form-data">
@@ -39,6 +37,7 @@
                 <button type="submit">Create Quiz</button>
             </form>
         </main>
+        <a class="watermark" href="https://git2.zettoit.eu/zettoit"><img src="/static/zettoit-style/zettoit.svg" alt="zettoIT Logo"></a>
         <script src="/static/htmx.min.js"></script>
     </body>
 </html>
diff --git a/templates/play.stpl b/templates/play.stpl
index f350ef3..2ee0d1b 100644
--- a/templates/play.stpl
+++ b/templates/play.stpl
@@ -4,7 +4,7 @@
     <head>
         <title>zettoIT ARS</title>
         <meta charset="UTF-8">
-        <link rel="stylesheet" href="/static/pico.min.css">
+        <link rel="stylesheet" href="/static/zettoit-style/zettoit.css">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
     </head>
     <body>
@@ -30,6 +30,7 @@
 
 <% if !htmx { %>
         </main>
+        <a class="watermark" href="https://git2.zettoit.eu/zettoit"><img src="/static/zettoit-style/zettoit.svg" alt="zettoIT Logo"></a>
         <script src="/static/htmx.min.js"></script>
     </body>
 </html>
diff --git a/templates/single_choice/result.stpl b/templates/single_choice/result.stpl
index 55509bc..988741f 100644
--- a/templates/single_choice/result.stpl
+++ b/templates/single_choice/result.stpl
@@ -1,20 +1,18 @@
 <% if is_correct { %>
-    <article>
-        <center><img src="/static/check.svg" width="50%"/></center>
-        <center><h1>Correct</h1></center>
-        <center><p>Your answer is correct. The correct answer is <b><%= correct_answer %></b>.</p></center>
+    <article class="centered">
+        <h1>Correct</h1>
+        <p>Your answer is correct. The correct answer is <b><%= correct_answer %></b>.</p>
     </article>
 <% } else { %>
-    <article>
-        <center><img src="/static/xmark.svg" width="50%"/></center>
-        <center><h1>Wrong</h1></center>
-        <center><p>
+    <article class="centered">
+        <h1>Wrong</h1>
+        <p>
             Your answer is incorrect. The correct answer is <b><%= correct_answer %></b>.
             <% if let Some(player_answer) = player_answer { %>
                 You answered <b><%= player_answer %></b>.
             <% } else { %>
                 You didn't answer the question.
             <% } %>
-            </p></center>
+        </p>
     </article>
 <% } %>
diff --git a/templates/view.stpl b/templates/view.stpl
index b654e81..5ce02db 100644
--- a/templates/view.stpl
+++ b/templates/view.stpl
@@ -4,16 +4,20 @@
     <head>
         <title>zettoIT ARS</title>
         <meta charset="UTF-8">
-        <link rel="stylesheet" href="/static/charts.min.css">
-        <link rel="stylesheet" href="/static/pico.min.css">
+        <link rel="stylesheet" href="/static/zettoit-style/zettoit.css">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <style>
+            .qrcode svg{
+                filter: invert();
+                width: 100%;
+                height: auto;
+            }
+        </style>
     </head>
     <body>
         <script src="/static/chart.js"></script>
         <main class="container" hx-sse="connect:/<%= id %>/view/events swap:message">
 <% } %>
-            <h1>zettoIT ARS</h1>
-
 <% if let ViewerState::Answering{ inner_body } = state { %>
             <%- inner_body %>
 
@@ -31,8 +35,8 @@
 
 <% } else if let ViewerState::NotStarted((player, qrcode, url)) = state { %>
             </article>
-                <center><%- qrcode %></center>
-                <center><%= url %></center>
+                <center class="qrcode"><%- qrcode %></center>
+                <center>or visit <%= url %></center>
                 <button hx-post="" class="outline">Start Quiz with <b><%= player %></b> Players</button>
             </article>
 <% } else {%>
@@ -42,6 +46,7 @@
 <% } %>
 <% if !htmx { %>
         </main>
+        <a class="watermark" href="https://git2.zettoit.eu/zettoit"><img src="/static/zettoit-style/zettoit.svg" alt="zettoIT Logo"></a>
         <script src="/static/htmx.min.js"></script>
     </body>
 </html>
diff --git a/testquiz.toml b/testquiz.toml
index a336775..63f6cc5 100644
--- a/testquiz.toml
+++ b/testquiz.toml
@@ -1,4 +1,4 @@
-wait_for = 15
+wait_for = 3600
 
 [[questions]]
 type = "single_choice"
