diff --git a/Source/Build.py b/Source/Build.py
index 969bf88..05b7ae4 100755
--- a/Source/Build.py
+++ b/Source/Build.py
@@ -516,7 +516,7 @@ def Main(Args, FeedEntries):
 		print("[I] Generating Gemtext")
 		GemtextCompileList(
 			Pages,
-			Header=Args.GemtextHeader if Args.GemtextHeader else '<h1>{}</h1><br>'.format(SiteName) if SiteName else '')
+			Header=Args.GemtextHeader if Args.GemtextHeader else '# {}\n\n'.format(SiteName) if SiteName else '')
 
 	DelTmp()
 	os.system("cp -R Assets/* public/")
diff --git a/Source/Modules/Gemini.py b/Source/Modules/Gemini.py
index 1386f4f..f368ab4 100644
--- a/Source/Modules/Gemini.py
+++ b/Source/Modules/Gemini.py
@@ -31,20 +31,21 @@ def StripAttrs(HTML):
 			t.attrs = {}
 	return str(Soup)
 
-def GemtextCompileList(Pages, Header):
+def GemtextCompileList(Pages, Header=''):
 	Cmd = ''
 	for File, Content, Titles, Meta, ContentHTML, SlimHTML, Description, Image in Pages:
-		if Header:
-			SlimHTML = Header + SlimHTML
 		Src = 'public.gmi/{}.html.tmp'.format(StripExt(File))
+		Dst = 'public.gmi/{}.gmi'.format(StripExt(File))
 		SlimHTML = StripAttrs(SlimHTML)
 		for i in ('ol', 'ul', 'li'):
 			for j in ('<'+i+'>', '</'+i+'>'):
 				SlimHTML = SlimHTML.replace(j, '')
 		WriteFile(Src, SlimHTML.replace('</a>', '</a><br>').replace('.html', '.gmi')) # TODO: Adjust links properly..
-		Dst = 'public.gmi/{}.gmi'.format(StripExt(File))
 		Cmd += 'cat "{}" | html2gmi > "{}"; '.format(Src, Dst)
 	os.system(Cmd)
+	for File, Content, Titles, Meta, ContentHTML, SlimHTML, Description, Image in Pages:
+		Dst = 'public.gmi/{}.gmi'.format(StripExt(File))
+		WriteFile(Dst, Header + ReadFile(Dst))
 
 def FindEarliest(Str, Items):
 	Pos, Item = 0, ''