diff --git a/Source/Build.py b/Source/Build.py
index f0a013f..2ec70db 100755
--- a/Source/Build.py
+++ b/Source/Build.py
@@ -63,18 +63,10 @@ def GetConfMenu(Entries, MarkdownExts):
 			Menu += [[]]
 		for i in Entries:
 			e = Entries[i]
-			#if not (e.startswith('<') or e.endswith('>') or e.startswith('[') or e.endswith(')')):
 			if not ((e.startswith('<') or e.startswith('[') or e.startswith('- ')) and (e.endswith('>') or e.endswith(')') or e.endswith(' }'))):
 				if not e.lower().endswith('.html'):
 					e += '.html'
 			Menu[int(i)] = e
-			#if (e.startswith('<') and e.endswith('>')) or (e.startswith('[') and (e.endswith(')') or e.endswith('}'))):
-			#	Menu[int(i)] = markdown(e, extensions=MarkdownExts)
-			#else:
-			#	if not e.lower().endswith('.html'):
-			#		e += '.html'
-			#	Menu[int(i)] = e
-	#print(Menu)
 	return Menu
 
 def Main(Args, FeedEntries):
@@ -148,6 +140,7 @@ def Main(Args, FeedEntries):
 		SiteLang=SiteLang,
 		Locale=Locale,
 		Minify=Minify,
+		NoScripts=True if Args.NoScripts else False,
 		Sorting=SetSorting(literal_eval(Args.ContextParts) if Args.ContextParts else {}),
 		MarkdownExts=MarkdownExts,
 		AutoCategories=AutoCategories)
@@ -216,6 +209,7 @@ if __name__ == '__main__':
 	Parser.add_argument('--SiteName', type=str)
 	Parser.add_argument('--BlogName', type=str)
 	Parser.add_argument('--SiteDomain', type=str)
+	Parser.add_argument('--NoScripts', type=bool)
 	Parser.add_argument('--GemtextOut', type=bool)
 	Parser.add_argument('--GemtextHeader', type=str)
 	Parser.add_argument('--SiteTagline', type=str)
diff --git a/Source/Modules/Site.py b/Source/Modules/Site.py
index 0640aed..dfe38b5 100644
--- a/Source/Modules/Site.py
+++ b/Source/Modules/Site.py
@@ -293,7 +293,7 @@ def DoMinifyHTML(HTML):
 		convert_charrefs=True,
 		keep_pre=True)
 
-def MakeSite(TemplatesText, PartsText, ContextParts, ContextPartsText, ConfMenu, SiteName, BlogName, SiteTagline, SiteDomain, SiteRoot, FolderRoots, SiteLang, Locale, Minify, Sorting, MarkdownExts, AutoCategories):
+def MakeSite(TemplatesText, PartsText, ContextParts, ContextPartsText, ConfMenu, SiteName, BlogName, SiteTagline, SiteDomain, SiteRoot, FolderRoots, SiteLang, Locale, Minify, NoScripts, Sorting, MarkdownExts, AutoCategories):
 	PagesPaths, PostsPaths, Pages, MadePages, Categories = [], [], [], [], {}
 	for Ext in FileExtensions['Pages']:
 		for File in Path('Pages').rglob('*.{}'.format(Ext)):
@@ -363,13 +363,10 @@ def MakeSite(TemplatesText, PartsText, ContextParts, ContextPartsText, ConfMenu,
 				Pages += [[File, Content, Titles, Meta]]
 
 	for i,e in enumerate(ConfMenu):
-		#print(e,i)
 		for File, Content, Titles, Meta in Pages:
 			File = StripExt(File)+'.html'
 			if e == File:
 				ConfMenu[i] = None
-				#print(File)
-		#print(ConfMenu)
 
 	print("[I] Writing Pages")
 	for File, Content, Titles, Meta in Pages:
@@ -405,6 +402,11 @@ def MakeSite(TemplatesText, PartsText, ContextParts, ContextPartsText, ConfMenu,
 			Categories=Categories,
 			SiteLang=SiteLang,
 			Locale=Locale)
+		if NoScripts:
+			HTML = (HTML
+				).replace('<script>', '<!-- script >'
+				).replace('<script ', '<!-- script '
+				).replace('</script>', '</ script -->')
 		if Minify:
 			HTML = DoMinifyHTML(HTML)
 		WriteFile(PagePath, HTML)
diff --git a/Source/Modules/Sitemap.py b/Source/Modules/Sitemap.py
index b35e5b5..4aebcc4 100644
--- a/Source/Modules/Sitemap.py
+++ b/Source/Modules/Sitemap.py
@@ -7,7 +7,7 @@
 |   Copyright (C) 2022, OctoSpacc     |
 | ================================= """ 
 
-import urllib
+from urllib.parse import quote as URLEncode
 from Modules.Utils import *
 
 def MakeSitemap(Pages, SiteDomain=''):
@@ -15,5 +15,5 @@ def MakeSitemap(Pages, SiteDomain=''):
 	for File, Content, Titles, Meta, ContentHTML, SlimHTML, Description, Image in Pages:
 		File = '{}.html'.format(StripExt(File))
 		Domain = SiteDomain + '/' if SiteDomain else ' '
-		Map += Domain + urllib.parse.quote(File) + '\n'
+		Map += Domain + URLEncode(File) + '\n'
 	WriteFile('public/sitemap.txt', Map)
diff --git a/TODO b/TODO
new file mode 100644
index 0000000..2c38a62
--- /dev/null
+++ b/TODO
@@ -0,0 +1,2 @@
+- ActivityPub: Only post "Blog" posts and not older than some date
+- Fix some CLI arguments stuff