diff --git a/Makefile b/Makefile
index 9c80bdd..a740d3e 100644
--- a/Makefile
+++ b/Makefile
@@ -11,13 +11,15 @@ STATIC_DIR=static
OUTPUT_DIR=output
# The pandoc template to use
-TEMPLATE=template.html
-
-## You should not need to change anything beyond this line
+TEMPLATE=utils/template.html
# The pandoc lua filter to use
# The language code and file extension will be appended later
-FILTER=filters/link-filter.
+FILTER=utils/link-filter.
+
+## You should not need to change anything beyond this line
+
+
STATIC=$(patsubst $(STATIC_DIR)/%,$(OUTPUT_DIR)/%,$(shell find $(STATIC_DIR) -type f))
OUTPUT=$(patsubst $(INPUT_DIR)/%.md,$(OUTPUT_DIR)/%/index.html,$(shell find $(INPUT_DIR) -type f))
@@ -53,7 +55,7 @@ test:
cd $(OUTPUT_DIR); python3 -m http.server 9000
mon:
- @echo "find $(INPUT_DIR)/ $(STATIC_DIR)/ $(dir $(TEMPLATE))/ -type f | entr make"
+ @echo "find $(INPUT_DIR)/ $(STATIC_DIR)/ $(dir $(TEMPLATE)) -type f | entr make"
.PHONY: clean test
diff --git a/content/en/guides/mastodon.md b/content/en/guides/mastodon.md
index 62439cd..219ea2b 100644
--- a/content/en/guides/mastodon.md
+++ b/content/en/guides/mastodon.md
@@ -12,7 +12,7 @@ Anyways, this tutorial will focus on how to use Mastodon and some basic Fedivers
If you haven't already then go register an account over at ~vern, there is also a guide for doing that [here](/guides/register) (Make sure to enable Mastodon as a service or [contact the ~vern administrators](/admins/) to have them create it for you)
-===== Logging in =====
+## Logging in
Open up your web browser and go to [fedi.vern.cc](https://fedi.vern.cc), you will see a login screen here. Simply input the email address and password you used for registration, if you are having issues logging in then [contact the ~vern administrators](/admins/) who will help you out.
diff --git a/static/index.html b/static/index.html
index 757406b..e221454 100644
--- a/static/index.html
+++ b/static/index.html
@@ -4,7 +4,7 @@