diff --git a/src/config.toml b/src/config.toml
index 2ab522d..88046a7 100644
--- a/src/config.toml
+++ b/src/config.toml
@@ -1,3 +1,4 @@
 baseURL = "https://vikunja.io/"
 languageCode = "en-us"
 title = "Vikunja"
+theme = "vikunja"
diff --git a/src/themes/vikunja-web/layouts/partials/disqus.html b/src/themes/vikunja-web/layouts/partials/disqus.html
deleted file mode 100644
index 05ff76a..0000000
--- a/src/themes/vikunja-web/layouts/partials/disqus.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{{ if .Site.DisqusShortname }}
-	<div id="disqus_thread"></div>
-
-	<script type="text/javascript">
-		var disqus_shortname = '{{ .Site.DisqusShortname }}';
-		var disqus_identifier = '{{ .Permalink }}';
-		var disqus_title = '{{ .Title }}';
-		var disqus_url = '{{ .Permalink }}';
-
-		(function() {
-			var dsq = document.createElement('script');
-
-			dsq.type = 'text/javascript';
-			dsq.async = true;
-			dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-
-			(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-		})();
-	</script>
-
-	<noscript>
-		Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
-	</noscript>
-{{end}}
diff --git a/src/themes/vikunja-web/layouts/partials/toc.html b/src/themes/vikunja-web/layouts/partials/toc.html
deleted file mode 100644
index 8fba373..0000000
--- a/src/themes/vikunja-web/layouts/partials/toc.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{{ if .Params.toc }}
-	<!-- <aside>
-		{{ .TableOfContents }}
-	</aside> -->
-{{ end }}
diff --git a/src/themes/vikunja-web/archetypes/default.md b/src/themes/vikunja/archetypes/default.md
similarity index 100%
rename from src/themes/vikunja-web/archetypes/default.md
rename to src/themes/vikunja/archetypes/default.md
diff --git a/src/themes/vikunja/layouts/_default/list.html b/src/themes/vikunja/layouts/_default/list.html
new file mode 100644
index 0000000..e69de29
diff --git a/src/themes/vikunja/layouts/_default/single.html b/src/themes/vikunja/layouts/_default/single.html
new file mode 100644
index 0000000..e399c40
--- /dev/null
+++ b/src/themes/vikunja/layouts/_default/single.html
@@ -0,0 +1,10 @@
+{{ partial "header.html" . }}
+{{ partial "navbar.html" . }}
+
+<div class="container is-centered page">
+	<div class=" content">
+		{{ .Content }}
+	</div>
+</div>
+
+{{ partial "footer.html" . }}
diff --git a/src/themes/vikunja/layouts/doc/list.html b/src/themes/vikunja/layouts/doc/list.html
new file mode 100644
index 0000000..e69de29
diff --git a/src/themes/vikunja/layouts/doc/single.html b/src/themes/vikunja/layouts/doc/single.html
new file mode 100644
index 0000000..d1c839e
--- /dev/null
+++ b/src/themes/vikunja/layouts/doc/single.html
@@ -0,0 +1,17 @@
+{{ partial "header.html" . }}
+{{ partial "navbar.html" . }}
+
+<div class="container is-centered page">
+	<div class="columns">
+		<div class="column is-one-quarter">
+			{{ partial "menu" . }}
+		</div>
+		<div class="column">
+			<div class=" content">
+				{{ .Content }}
+			</div>
+		</div>
+	</div>
+</div>
+
+{{ partial "footer.html" . }}
diff --git a/src/themes/vikunja/layouts/home/index.html b/src/themes/vikunja/layouts/home/index.html
new file mode 100644
index 0000000..550ab24
--- /dev/null
+++ b/src/themes/vikunja/layouts/home/index.html
@@ -0,0 +1,36 @@
+{{ partial "header.html" . }}
+
+<section class="hero is-primary homepage-hero">
+	<!-- Hero head: will stick at the top -->
+	<div class="hero-head">
+		{{ partial "navbar.html" . }}
+	</div>
+	<!-- Hero content: will be in the middle -->
+	<div class="hero-body">
+		<div class="container has-text-centered">
+			{{ .Content }}
+		</div>
+	</div>
+
+	<div class="hero-foot">
+		<img src="{{ .Site.BaseURL }}/images/screenshot.jpg"/>
+	</div>
+</section>
+
+<section class="hero is-link feature-shoutout">
+	<div class="hero-body">
+		<div class="container">
+			<div class="columns">
+			{{ range $index, $element := .Data.Pages }}
+				{{ if eq .Section "features" }}
+					<div class="column">
+						{{ .Content }}
+					</div>
+				{{ end }}
+			{{ end }}
+			</div>
+		</div>
+	</div>
+</section>
+
+{{ partial "footer.html" . }}
diff --git a/src/themes/vikunja/layouts/home/list.html b/src/themes/vikunja/layouts/home/list.html
new file mode 100644
index 0000000..e69de29
diff --git a/src/themes/vikunja/layouts/page/list.html b/src/themes/vikunja/layouts/page/list.html
new file mode 100644
index 0000000..e69de29
diff --git a/src/themes/vikunja/layouts/page/single.html b/src/themes/vikunja/layouts/page/single.html
new file mode 100644
index 0000000..d1c839e
--- /dev/null
+++ b/src/themes/vikunja/layouts/page/single.html
@@ -0,0 +1,17 @@
+{{ partial "header.html" . }}
+{{ partial "navbar.html" . }}
+
+<div class="container is-centered page">
+	<div class="columns">
+		<div class="column is-one-quarter">
+			{{ partial "menu" . }}
+		</div>
+		<div class="column">
+			<div class=" content">
+				{{ .Content }}
+			</div>
+		</div>
+	</div>
+</div>
+
+{{ partial "footer.html" . }}
diff --git a/src/themes/vikunja/layouts/partials/footer.html b/src/themes/vikunja/layouts/partials/footer.html
new file mode 100644
index 0000000..0889f21
--- /dev/null
+++ b/src/themes/vikunja/layouts/partials/footer.html
@@ -0,0 +1,49 @@
+		<footer class="footer">
+			<div class="container">
+				<div class="content has-text-centered">
+					<p>
+						Copyright &copy; {{ now.Year }} <a href="{{ .Site.Params.website }}">{{ .Site.Params.author }}</a>. All rights reserved. Made with <i class="fa fa-heart" aria-hidden="true"></i> and <a href="https://gohugo.io">Hugo</a>.
+					</p>
+					<p>
+						{{ $lang := .Lang }}{{ $base := .Site.BaseURL }}{{ range .Site.Languages }}
+						<a class="nav-link" href="{{ $base }}{{ .Lang }}">{{ .LanguageName }}</a>
+						{{ end }}
+					</p>
+				</div>
+			</div>
+		</footer>
+
+		<script>
+            document.addEventListener('DOMContentLoaded', function () {
+
+                // Get all "navbar-burger" elements
+                var $navbarBurgers = Array.prototype.slice.call(document.querySelectorAll('.navbar-burger'), 0);
+
+                // Check if there are any navbar burgers
+                if ($navbarBurgers.length > 0) {
+
+                    // Add a click event on each of them
+                    $navbarBurgers.forEach(function ($el) {
+                        $el.addEventListener('click', function () {
+
+                            // Get the target from the "data-target" attribute
+                            var target = $el.dataset.target;
+                            var $target = document.getElementById(target);
+
+                            // Toggle the class on both the "navbar-burger" and the "navbar-menu"
+                            $el.classList.toggle('is-active');
+                            $target.classList.toggle('is-active');
+
+
+                            document.getElementById('navbar-background').classList.toggle('is-active');
+
+
+                        });
+                    });
+                }
+
+            });
+		</script>
+
+		</body>
+</html>
diff --git a/src/themes/vikunja/layouts/partials/header.html b/src/themes/vikunja/layouts/partials/header.html
new file mode 100644
index 0000000..3a0a56e
--- /dev/null
+++ b/src/themes/vikunja/layouts/partials/header.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+
+<html lang="en">
+	<head>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+		<meta http-equiv="x-ua-compatible" content="ie=edge">
+		<meta property="og:title" content="{{ if not .IsHome }}{{ .Title }} | {{ end }}{{ .Site.Title }}"></meta>
+ 		{{ if .IsPage }}
+		<meta property="og:description" content="{{ if .IsPage }}{{ .Description }}{{end}}" />
+		{{ end }}
+		<meta property="og:type" content="{{ if .IsPage }}article{{ else }}website{{ end }}"></meta>
+		<meta property="og:url" content="{{ .Permalink }}"></meta>
+		<meta property="og:image" content="{{ .Site.BaseURL }}/images/vikunja.png"></meta>
+		{{ .Hugo.Generator }}
+
+		<title>{{ if and (not .IsHome) .Title }}{{ .Title }} | {{ end }}{{ .Site.Title }}</title>
+
+		{{ with .RSSLink }}
+			<link href="{{ . }}" rel="alternate" type="application/rss+xml" title="{{ $.Site.Title }}" />
+			<link href="{{ . }}" rel="feed" type="application/rss+xml" title="{{ $.Site.Title }}" />
+		{{ end }}
+
+		<link rel="canonical" href="{{ .Permalink }}">
+
+		<link rel="stylesheet" href="{{ .Site.BaseURL }}styles/main.css">
+
+		<link rel="shortcut icon" type="image/x-icon" href="{{ .Site.BaseURL }}images/favicon.png">
+		<link rel="icon" type="image/x-icon" href="{{ .Site.BaseURL }}images/favicon.png">
+	</head>
+	<body>
diff --git a/src/themes/vikunja/layouts/partials/menu.html b/src/themes/vikunja/layouts/partials/menu.html
new file mode 100644
index 0000000..0dd95f0
--- /dev/null
+++ b/src/themes/vikunja/layouts/partials/menu.html
@@ -0,0 +1,28 @@
+<aside class="menu">
+	{{ $currentNode := . }}{{ range .Site.Menus.sidebar }}
+	{{ if .HasChildren }}
+	<p class="menu-label">
+		{{ .Pre }}
+		{{ .Name }}
+	</p>
+	<ul class="menu-list">
+		{{ range .Children }}
+		<li>
+			<a href="{{ .URL | relLangURL }}" {{ if $currentNode.IsMenuCurrent "sidebar" . }}class="is-active"{{ end }}>
+			{{ .Pre }}
+			{{ .Name }}
+			</a>
+		</li>
+		{{ end }}
+	</ul>
+	{{ else }}
+	<li>
+		<a href="{{ .URL | relLangURL }}">
+			{{ .Pre }}
+			{{ .Name }}
+		</a>
+	</li>
+	{{ end }}
+	{{ end }}
+	</ul>
+</aside>
diff --git a/src/themes/vikunja/layouts/partials/navbar.html b/src/themes/vikunja/layouts/partials/navbar.html
new file mode 100644
index 0000000..e020046
--- /dev/null
+++ b/src/themes/vikunja/layouts/partials/navbar.html
@@ -0,0 +1,20 @@
+<nav class="navbar">
+	<div class="container">
+		<div class="navbar-brand">
+			<a class="navbar-item" href="{{ .Site.BaseURL }}">
+				<img src="{{ .Site.BaseURL }}images/gitea.png" alt="{{ .Site.Title }}">
+			</a>
+			<span class="navbar-burger burger" data-target="navMenu" aria-label="menu" aria-expanded="false">
+              <span></span>
+              <span></span>
+              <span></span>
+            </span>
+		</div>
+		<div class="navbar-menu" id="navMenu">
+			<div class="navbar-end">
+				{{ partial "toplinks.html" . }}
+			</div>
+		</div>
+		<div class="navbar-background" id="navbar-background"></div>
+	</div>
+</nav>
\ No newline at end of file
diff --git a/src/themes/vikunja/layouts/partials/toplinks.html b/src/themes/vikunja/layouts/partials/toplinks.html
new file mode 100644
index 0000000..c4875db
--- /dev/null
+++ b/src/themes/vikunja/layouts/partials/toplinks.html
@@ -0,0 +1,7 @@
+<span class="navbar-item logo"><img src="{{ .Site.BaseURL }}images/gitea.png" alt="{{ .Site.Title }}"></span>
+{{ $currentNode := . }}{{ range .Site.Menus.page }}
+	<a class="navbar-item" href="{{ .URL }}">
+		<i class="fa fa-{{ .Pre }}"></i>&nbsp;
+		{{ .Name }}
+	</a>
+{{ end }}
diff --git a/src/themes/vikunja/layouts/post/list.html b/src/themes/vikunja/layouts/post/list.html
new file mode 100644
index 0000000..6aea8d3
--- /dev/null
+++ b/src/themes/vikunja/layouts/post/list.html
@@ -0,0 +1,40 @@
+{{ partial "header.html" . }}
+{{ partial "navbar.html" . }}
+
+<div class="container content page">
+	{{ $paginator := .Paginate (where .Data.Pages "Type" "post") }}{{ range $paginator.Pages }}
+		<div class="card">
+			<div class="card-content">
+				<div class="media">
+					<div class="media-content">
+						<a class="title is-4" href="{{ .Permalink }}">{{ .Title }}</a>
+						<p class="subtitle is-6">{{ .Date.Format "Mon Jan 2, 2006" }} {{ i18n "authored_by" }}
+							<a href="https://github.com/{{ .Params.author | default .Site.Params.author }}">
+							{{ .Params.author | default .Site.Params.author }}
+							</a>
+						</p>
+					</div>
+				</div>
+
+				<div class="content">
+					{{ .Summary }}
+				</div>
+
+				<a href="{{ .Permalink }}" class="button is-success is-outlined">
+					{{ i18n "read_more" }}
+				</a>
+			</div>
+		</div>
+	{{ end }}
+
+	<nav class="pagination is-centered" role="navigation" aria-label="pagination">
+		{{ if .Paginator.HasPrev}}
+			<a class="pagination-previous" href="{{ .Paginator.Prev.URL }}">{{ i18n "page_prev" }}</a>
+		{{ end }}
+		{{ if .Paginator.HasNext }}
+			<a class="pagination-next" href="{{ .Paginator.Next.URL }}">{{ i18n "page_next" }}</a>
+		{{ end }}
+	</nav>
+</div>
+
+{{ partial "footer.html" . }}
\ No newline at end of file
diff --git a/src/themes/vikunja/layouts/post/single.html b/src/themes/vikunja/layouts/post/single.html
new file mode 100644
index 0000000..d3c393e
--- /dev/null
+++ b/src/themes/vikunja/layouts/post/single.html
@@ -0,0 +1,24 @@
+{{ partial "header.html" . }}
+{{ partial "navbar.html" . }}
+
+<div class="container is-centered page">
+	<div class="content">
+		<h2>
+			<a href="{{ .Permalink }}">
+				{{ .Title }}
+			</a>
+		</h2>
+		<p>
+			<i>{{ .Date.Format "Mon Jan 2, 2006" }}</i>
+			{{ i18n "authored_by" }}
+			<b>
+				<a href="https://github.com/{{ .Params.author | default .Site.Params.author }}">
+					{{ .Params.author | default .Site.Params.author }}
+				</a>
+			</b>
+		</p>
+		{{ .Content }}
+	</div>
+</div>
+
+{{ partial "footer.html" . }}
diff --git a/src/themes/vikunja-web/theme.toml b/src/themes/vikunja/theme.toml
similarity index 100%
rename from src/themes/vikunja-web/theme.toml
rename to src/themes/vikunja/theme.toml