diff --git a/installer.sh b/installer.sh
index d469372..308fe0c 100644
--- a/installer.sh
+++ b/installer.sh
@@ -234,7 +234,7 @@ wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/"$bra
 wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/"$branch"/config/lets-encrypt/chain.pem -O /etc/letsencrypt/live/$domain/chain.pem
 wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/"$branch"/config/lets-encrypt/fullchain.pem -O /etc/letsencrypt/live/$domain/fullchain.pem
 wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/"$branch"/config/lets-encrypt/privkey.pem -O /etc/letsencrypt/live/$domain/privkey.pem
-wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/"$branch"/config/nginx/site-enabled -O /etc/nginx/sites-available/mail.ictdownwerk
+wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/"$branch"/config/nginx/site-enabled -O /etc/nginx/sites-available/mail.ictdownwerk.com
 openssl dhparam -out /etc/ssl/certs/dhparam.pem "$dhparam"
 openssl dhparam -out /etc/letsencrypt/ssl-dhparams.pem "$dhparam"
 chmod 777 -R /etc/letsencrypt/ssl-dhparams.pem
@@ -243,7 +243,7 @@ chmod 777 -R /etc/letsencrypt/live/$domain/cert.pem
 chmod 777 -R /etc/letsencrypt/live/$domain/chain.pem
 chmod 777 -R /etc/letsencrypt/live/$domain/fullchain.pem
 chmod 777 -R /etc/letsencrypt/live/$domain/privkey.pem
-chmod 644 -R /etc/nginx/sites-available/mail.ictdownwerk
+chmod 644 -R /etc/nginx/sites-available/mail.ictdownwerk.com
 
 ##-----------------------##
 #    Postfix Installer    #
@@ -369,7 +369,6 @@ apt install zip lrzip liblz4-tool lhasa arj unzip bzip2 nomarch cpio lzop cabext
 sed -i -e 's/@bypass/'@bypass'/' -e 's/   /    /' /etc/amavis/conf.d/15-content_filter_mode
 adduser clamav amavis
 sed -i 's/clamd.conf/'clamd.conf'/g' /etc/clamav/freshclam.conf
-echo "" >> /etc/postfix/main.cf
 echo "#Pipe incoming mail trough Amavis" >> /etc/postfix/main.cf
 postconf -e 'content_filter = amavis:[127.0.0.1]:10024'
 postconf -e 'receive_override_options = no_address_mappings'
@@ -391,10 +390,10 @@ echo "  -o mynetworks=127.0.0.0/8" >> /etc/postfix/master.cf
 echo "  -o strict_rfc821_envelopes=yes" >> /etc/postfix/master.cf
 echo "  -o receive_override_options=no_unknown_recipient_checks,no_header_body_checks" >> /etc/postfix/master.cf
 echo "  -o smtpd_bind_address=127.0.0.1" >> /etc/postfix/master.cf
-wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/omega/config/amavis/15-content_filter_mode -O /etc/amavis/conf.d15-content_filter_mode
-wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/omega/config/amavis/20-debian_defaults -O /etc/amavis/conf.d/20-debian_defaults
-wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/omega/config/amavis/21-ubuntu_defaults -O /etc/amavis/conf.d/21-ubuntu_defaults
-wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/omega/config/amavis/50-user -O /etc/amavis/conf.d/50-user
+wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/"$branch"/config/amavis/15-content_filter_mode -O /etc/amavis/conf.d15-content_filter_mode
+wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/"$branch"/config/amavis/20-debian_defaults -O /etc/amavis/conf.d/20-debian_defaults
+wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/"$branch"/config/amavis/21-ubuntu_defaults -O /etc/amavis/conf.d/21-ubuntu_defaults
+wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/"$branch"/config/amavis/50-user -O /etc/amavis/conf.d/50-user
 
 ##-----------------------##
 #    ClamAV Permission    #
@@ -431,12 +430,12 @@ source /tmp/unattended.sh
 ##-----------------------##
 #    Enabling Services    #
 ##-----------------------##
-systemctl enable nginx mysql postfix postfix@- dovecot fail2ban clamav-daemon clamav-freshclam clamsmtp spamassassin amavisd-new amavisd-snmp-subagent amavis-mc amavis amavis-snmp-subagent
+systemctl enable nginx mysql postfix postfix@- dovecot fail2ban clamav-daemon clamav-freshclam clamsmtp spamassassin amavisd-new amavisd-snmp-subagent amavis-mc amavis-snmp-subagent
 
 ##-----------------------##
 #    Starting Services    #
 ##-----------------------##
-systemctl restart nginx mysql postfix postfix@- dovecot fail2ban clamav-daemon clamav-freshclam clamsmtp spamassassin amavisd-new amavisd-snmp-subagent amavis-mc amavis amavis-snmp-subagent
+systemctl restart nginx mysql postfix postfix@- dovecot fail2ban clamav-daemon clamav-freshclam clamsmtp spamassassin amavisd-new amavisd-snmp-subagent amavis-mc amavis-snmp-subagent
 
 ##------------------##
 #    Final Update    #