diff --git a/Projects/bachelor/index.md b/Projects/bachelor/index.md
index be4a0e4..f550608 100644
--- a/Projects/bachelor/index.md
+++ b/Projects/bachelor/index.md
@@ -1,10 +1,14 @@
 # Bachelorarbeit
 
-[[Projects/bachelor/ideas]]
-
 TODO Liste
 
 - [ ] Ideen finden
 - [ ] Betreuer finden
 - [ ] Idee festlegen
 
+[[Projects/bachelor/ideas]]
+
+## Bachelor Topics
+```query
+bachelor render [[templates/topic]]
+```
\ No newline at end of file
diff --git a/Projects/bachelor/topics/RDF.md b/Projects/bachelor/topics/RDF.md
index bd2b5bf..f8b76cb 100644
--- a/Projects/bachelor/topics/RDF.md
+++ b/Projects/bachelor/topics/RDF.md
@@ -1,10 +1,14 @@
-# _R_esource _D_escription _F_ramework
+# Resource Description Framework
+
+#topic #bachelor
 
 The RDF descripes resources as triplets of (object, pradicate, subject).
 
 Where object and subjects are in itself also always resources. Resources in the RDF are identified by URIs.
 
 The pradicate defines the type of relation between object and subject. [List of known pradicates](https://www.dublincore.org/specifications/dublin-core/dcmi-terms/)
-One example would be "/Projects/bachelor/topics/SemanticWeb.md" → title → SemanticWeb
 
-[https://www.dublincore.org/specifications/dublin-core/dcmi-terms/elements11/title/](Link to the pradicate \'title\')
+One example would be:
+**Projects/bachelor/topics/SemanticWeb.md** → title → **SemanticWeb**
+
+[Link to the pradicate 'title'](https://www.dublincore.org/specifications/dublin-core/dcmi-terms/elements11/title)
diff --git a/Projects/bachelor/topics/SemanticWeb.md b/Projects/bachelor/topics/SemanticWeb.md
index bf7512d..7000428 100644
--- a/Projects/bachelor/topics/SemanticWeb.md
+++ b/Projects/bachelor/topics/SemanticWeb.md
@@ -6,6 +6,6 @@ When we humans consume content such as web pages, documents or articles we gathe
 
 Semantic Web is the idea to make the web more readable for machines by enhancing web content with metadata that makes it easier for machines to consume and navigate web content.
 
-There are several standards to achive this goal, one of the most prominent ones is [[./RDF]]
+There are several standards to achive this goal, one of the most prominent ones is [[Projects/bachelor/topics/RDF|RDF]]
 
 
diff --git a/templates/page/Movie.md b/templates/page/Movie.md
new file mode 100644
index 0000000..1244686
--- /dev/null
+++ b/templates/page/Movie.md
@@ -0,0 +1,6 @@
+---
+date: {{releaseDate}}
+author: {{author}}
+---
+
+# {{name}}
\ No newline at end of file
diff --git a/templates/topic.md b/templates/topic.md
new file mode 100644
index 0000000..ec743dd
--- /dev/null
+++ b/templates/topic.md
@@ -0,0 +1 @@
+- [[{{name}}]] 
\ No newline at end of file