diff --git a/.gitignore b/.gitignore
index 97fe706..004a835 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-/helpers/crypt
+/etc/config
+/share/bin/crypt
+/share/bin/twigc
diff --git a/Makefile b/Makefile
index 0b9b535..1455c02 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,8 @@
+all: install
 
+install: build-crypt
+	wget -q -O ./share/bin/twigc https://github.com/okdana/twigc/releases/download/v0.3.1/twigc.phar
+	chmod +x ./share/bin/twigc
 
 build-crypt:
-	gcc -lcrypt ./src/crypt/crypt.c -o ./helpers/crypt
+	gcc -lcrypt ./src/crypt/crypt.c -o ./share/bin/crypt
diff --git a/bin/vhost-add b/bin/vhost-add
index 3a50223..6a5fb0a 100755
--- a/bin/vhost-add
+++ b/bin/vhost-add
@@ -2,7 +2,7 @@
 
 export SCRIPT_NAME="$(realpath "$0")"
 export SCRIPT_PATH="$(dirname "$SCRIPT_NAME")"
-export PATH="$SCRIPT_PATH/../helpers/:$PATH"
+export PATH="$SCRIPT_PATH/../share/bin/:$PATH"
 
 cd "$SCRIPT_PATH/../"
 
diff --git a/etc/config b/etc/config.dist
similarity index 100%
rename from etc/config
rename to etc/config.dist
diff --git a/helpers/twigc b/helpers/twigc
deleted file mode 100755
index 67d6a3b..0000000
Binary files a/helpers/twigc and /dev/null differ
diff --git a/helpers/form_choices b/share/bin/form_choices
similarity index 100%
rename from helpers/form_choices
rename to share/bin/form_choices
diff --git a/helpers/form_input b/share/bin/form_input
similarity index 100%
rename from helpers/form_input
rename to share/bin/form_input
diff --git a/helpers/form_yes_no b/share/bin/form_yes_no
similarity index 100%
rename from helpers/form_yes_no
rename to share/bin/form_yes_no
diff --git a/helpers/template b/share/bin/template
similarity index 100%
rename from helpers/template
rename to share/bin/template
diff --git a/src/templates/vhost-http.twig b/src/templates/vhost-http.twig
index 7fe7c37..f4497d4 100644
--- a/src/templates/vhost-http.twig
+++ b/src/templates/vhost-http.twig
@@ -10,7 +10,8 @@
 	ErrorLog /services/web/logs/{{ DOMAIN }}.log
 	CustomLog /services/web/logs/{{ DOMAIN }}.log combined
 {% block force_https %}{% if WEB_HTTPS_FORCE == "yes" %}
-	Redirect permanent / https://{{ DOMAIN }}/{% endif %}{% endblock %}
+	Redirect permanent / https://{{ DOMAIN }}/
+{% endif %}{% endblock %}
 
 	<Directory {{ DOCUMENT_ROOT }}>
 	    Options -Indexes +FollowSymLinks +MultiViews