diff --git a/.gitignore b/.gitignore
index b67af50..1e6973b 100755
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@ Rakefile
.jekyll-metadata
Gemfile.lock
_deploy.yml
+resources/*
+public/*
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..e23ef88
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "themes/toha"]
+ path = themes/toha
+ url = https://github.com/hugo-toha/toha
diff --git a/README.md b/README.md
index dfd73cf..cb15b5a 100755
--- a/README.md
+++ b/README.md
@@ -1,50 +1,17 @@
-Quelldateien der Homepage unter [rolandjesse.de](https://rolandjesse.de/). Basiert auf dem [Personal Jekyll Theme](https://github.com/le4ker/personal-jekyll-theme/).
+# Homepage rolandjesse.de
-# Seite bauen
+## Setup
-Jekyll und die erforderlichen Gems installieren:
-
-```shell
-bundle install
+```console
+git submodule add https://github.com/hugo-toha/toha themes/toha
```
-Seite bauen und lokalen Server unter [localhost:4000](http://localhost:4000) starten:
+`make`-Targets:
-```shell
-jekyll serve --livereload
-```
+* `make serve`: build locally and start development server
+* `make deploy`: build and deploy (via `rsync`)
+* `make clean`: remove the `public` folder that might have been created
-Seite mittels rsync (via scp) auf den Server laden (erfordert _deploy.yml mit den Zugangsdaten):
+## Related
-```shell
-jekyll build
-octopress deploy
-```
-
-Run using Docker:
-
-```
-docker run --rm -it -p 4000:4000 -v "$PWD:/srv/jekyll" jekyll/jekyll jekyll serve --watch --host "0.0.0.0" --config _config.yml,_config.dev.yml
-```
-
-Run using Docker with Docker Compose:
-```
-docker-compose up
-```
-
-## OSS used in { Personal }
-
-One of the reasons { Personal } is real is the following OSS projects:
-
- 1. [Grayscale](http://startbootstrap.com/template-overviews/grayscale/)
- 2. [hammer.js](https://hammerjs.github.io/)
- 3. [highlightjs](https://highlightjs.org/)
- 4. [RRSSB](https://github.com/kni-labs/rrssb)
- 5. [Timeline](https://github.com/kirbyt/timeline-jekyll-theme)
- 6. [typed.js](https://github.com/mattboldt/typed.js/)
-
-
+Uses the [toha](https://github.com/hugo-toha/toha) theme.
diff --git a/_includes/force-https.html b/_includes/force-https.html
deleted file mode 100644
index 622f749..0000000
--- a/_includes/force-https.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-{% if site.force-https and jekyll.environment == "production" %}
-
-
-
-
-
-
-{% endif %}
diff --git a/_layouts/index.html b/_layouts/index.html
deleted file mode 100755
index 1771d74..0000000
--- a/_layouts/index.html
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
- {% include head.html %}
-
-
-
- {% include navigation.html %}
-
- {% include header.html %}
-
- {% for p in site.pages_list %}
- {% for page in site.pages %}
- {% if p[1] == page.section-type %}
- {% include {{ page.path }} %}
- {% endif %}
- {% endfor %}
- {% endfor %}
-
- {% include footer.html %}
-
- {% include js.html %}
-
-
-
-
-
diff --git a/archetypes/default.md b/archetypes/default.md
new file mode 100644
index 0000000..00e77bd
--- /dev/null
+++ b/archetypes/default.md
@@ -0,0 +1,6 @@
+---
+title: "{{ replace .Name "-" " " | title }}"
+date: {{ .Date }}
+draft: true
+---
+
diff --git a/assets/images/background.jpg b/assets/images/background.jpg
new file mode 100644
index 0000000..59470ae
Binary files /dev/null and b/assets/images/background.jpg differ
diff --git a/img/favicon.ico b/assets/images/favicon.ico
similarity index 100%
rename from img/favicon.ico
rename to assets/images/favicon.ico
diff --git a/assets/images/favicon.png b/assets/images/favicon.png
new file mode 100644
index 0000000..e517855
Binary files /dev/null and b/assets/images/favicon.png differ
diff --git a/assets/images/inverted-logo.png b/assets/images/inverted-logo.png
new file mode 100644
index 0000000..c861fee
Binary files /dev/null and b/assets/images/inverted-logo.png differ
diff --git a/assets/images/main-logo.png b/assets/images/main-logo.png
new file mode 100644
index 0000000..e517855
Binary files /dev/null and b/assets/images/main-logo.png differ
diff --git a/img/roland_orange.jpg b/assets/images/roland.jpg
similarity index 100%
rename from img/roland_orange.jpg
rename to assets/images/roland.jpg
diff --git a/config.toml b/config.toml
index a18f689..d85acb5 100644
--- a/config.toml
+++ b/config.toml
@@ -1,3 +1,109 @@
baseURL = 'https://rolandjesse.de/'
languageCode = 'de-DE'
title = 'Roland Jesse'
+author = 'Roland Jesse'
+keywords = 'personal homepage'
+theme = 'toha'
+
+DefaultContentLanguage = 'de'
+
+# Enable global emoji support
+enableEmoji = true
+
+# Allow raw html in markdown file
+[markup.goldmark.renderer]
+unsafe = true
+
+[markup.tableOfContents]
+startLevel = 2
+endLevel = 6
+ordered = false
+
+# At least HTML and JSON are required for the main HTML content and
+# client-side JavaScript search
+[outputs]
+home = [ "HTML", "RSS", "JSON" ]
+
+# Site parameters
+[params]
+background = "/images/background.jpg"
+
+# specify whether you want to show Table of Contents in reading page
+enableTOC = false
+
+# Show tags under the post title
+enableTags = false
+
+# Specify whether to show flag in the language selector. Default is true.
+showFlags = false
+
+ # Provide logos for your site. The inverted logo will be used in the initial
+ # transparent navbar and the main logo will be used in the non-transparent navbar.
+ [params.logo]
+ main = "/images/main-logo.png"
+ inverted = "/images/inverted-logo.png"
+ favicon = "/images/favicon.png"
+
+ # Configure the number of section title visible in the top navbar
+ [params.topNavbar]
+ maxVisibleSections = 5
+
+ # Enable dark theme
+ [params.darkMode]
+ provider = "darkreader"
+ enable = true
+ default = "system"
+
+ # Configure various features of the toha theme
+ [params.features.portfolio]
+ enable = true
+
+ [params.features.blog]
+ enable = false
+
+ [params.features.blog.shareButtons]
+ facebook = false
+ twitter = false
+ linkedin = false
+ reddit = false
+ whatsapp = false
+ email = false
+
+ # Enable & configure "Notes" features
+ [params.features.notes]
+ enable = false
+
+ [params.features.comment]
+ enable = false
+
+ [params.features.analytics]
+ enabled = false
+
+ # Provide footer configuration.
+ [params.footer]
+ enable = false
+ # You can provide your custom footer template using this option.
+ # Put your template in "layouts/partials" folder of your repo.
+ template = "footer.html"
+
+ # Show/hide navigation in the footer. Default is "true".
+ [params.footer.navigation]
+ enable = true
+ customMenus = true
+
+ # Show/hide "Contact Me" section in the footer. Default is "true".
+ [params.footer.contactMe]
+ enable = true
+
+ # Show/hide credentials section in the footer. Default is "true".
+ [params.footer.credentials]
+ enable = false
+
+ # Show/hide newsletter section in the footer. Default is "true".
+ # Currently, it supports "mailchimp".
+ [params.footer.newsletter]
+ enable = false
+
+ # Show/hide disclaimer notice in the footer. Default is "false".
+ [params.footer.disclaimer]
+ enable = true
diff --git a/contact.html b/contact.html
deleted file mode 100755
index df55a81..0000000
--- a/contact.html
+++ /dev/null
@@ -1,8 +0,0 @@
----
-layout: null
-section-type: contact
-title: Kontact
----
-## Kontakt
-
-Am besten bin ich per E-Mail zu erreichen. Die anderen Kanäle sollten jedoch ebenfalls passabel funktionieren.
diff --git a/content/_index.md b/content/_index.md
new file mode 100755
index 0000000..e144d39
--- /dev/null
+++ b/content/_index.md
@@ -0,0 +1,3 @@
+---
+title: Home
+---
diff --git a/data/de/author.toml b/data/de/author.toml
new file mode 100644
index 0000000..e6a103b
--- /dev/null
+++ b/data/de/author.toml
@@ -0,0 +1,15 @@
+name = 'Roland Jesse'
+nickname = 'Roland'
+greeting = 'Das ist'
+image = 'images/roland.jpg'
+
+summary = [
+ 'Lieber produktiv prokrastinieren als gar nichts zu tun.',
+ 'Redet schneller als er denken kann. Klingt zumindest manchmal so.',
+ 'Introvertiert und redet trotzdem gern vor vielen Menschen.'
+]
+
+# give your some contact information. they will be used in the footer
+[contactInfo]
+email = 'kontakt@rolandjesse.de'
+linkedin = 'rolandjesse'
diff --git a/index.html b/index.html
deleted file mode 100755
index 4d2b296..0000000
--- a/index.html
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: index
-section-type: index
-sitemap:
- priority: 1.0
----
-
diff --git a/themes/toha b/themes/toha
new file mode 160000
index 0000000..55dd90a
--- /dev/null
+++ b/themes/toha
@@ -0,0 +1 @@
+Subproject commit 55dd90a0dda051791e6238614337a42ed2192612