diff --git a/public/de/sitemap.xml b/public/de/sitemap.xml
index f5b26de..a78d503 100755
--- a/public/de/sitemap.xml
+++ b/public/de/sitemap.xml
@@ -3,6 +3,11 @@
   xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <url>
     <loc>http://markinstefan.xyz/de/authors/</loc>
+    <xhtml:link
+                rel="alternate"
+                hreflang="de"
+                href="http://markinstefan.xyz/de/authors/"
+                />
     <xhtml:link
                 rel="alternate"
                 hreflang="en"
@@ -13,11 +18,6 @@
                 hreflang="ru"
                 href="http://markinstefan.xyz/ru/authors/"
                 />
-    <xhtml:link
-                rel="alternate"
-                hreflang="de"
-                href="http://markinstefan.xyz/de/authors/"
-                />
   </url><url>
     <loc>http://markinstefan.xyz/de/categories/</loc>
     <xhtml:link
diff --git a/public/en/sitemap.xml b/public/en/sitemap.xml
index 2837c9d..142f989 100755
--- a/public/en/sitemap.xml
+++ b/public/en/sitemap.xml
@@ -3,6 +3,11 @@
   xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <url>
     <loc>http://markinstefan.xyz/authors/</loc>
+    <xhtml:link
+                rel="alternate"
+                hreflang="en"
+                href="http://markinstefan.xyz/authors/"
+                />
     <xhtml:link
                 rel="alternate"
                 hreflang="ru"
@@ -13,11 +18,6 @@
                 hreflang="de"
                 href="http://markinstefan.xyz/de/authors/"
                 />
-    <xhtml:link
-                rel="alternate"
-                hreflang="en"
-                href="http://markinstefan.xyz/authors/"
-                />
   </url><url>
     <loc>http://markinstefan.xyz/categories/</loc>
     <xhtml:link
@@ -56,13 +56,13 @@
     <loc>http://markinstefan.xyz/</loc>
     <xhtml:link
                 rel="alternate"
-                hreflang="de"
-                href="http://markinstefan.xyz/de/"
+                hreflang="en"
+                href="http://markinstefan.xyz/"
                 />
     <xhtml:link
                 rel="alternate"
-                hreflang="en"
-                href="http://markinstefan.xyz/"
+                hreflang="de"
+                href="http://markinstefan.xyz/de/"
                 />
     <xhtml:link
                 rel="alternate"
@@ -122,11 +122,6 @@
                 />
   </url><url>
     <loc>http://markinstefan.xyz/series/</loc>
-    <xhtml:link
-                rel="alternate"
-                hreflang="de"
-                href="http://markinstefan.xyz/de/series/"
-                />
     <xhtml:link
                 rel="alternate"
                 hreflang="en"
@@ -137,8 +132,18 @@
                 hreflang="ru"
                 href="http://markinstefan.xyz/ru/series/"
                 />
+    <xhtml:link
+                rel="alternate"
+                hreflang="de"
+                href="http://markinstefan.xyz/de/series/"
+                />
   </url><url>
     <loc>http://markinstefan.xyz/tags/</loc>
+    <xhtml:link
+                rel="alternate"
+                hreflang="ru"
+                href="http://markinstefan.xyz/ru/tags/"
+                />
     <xhtml:link
                 rel="alternate"
                 hreflang="de"
@@ -149,10 +154,5 @@
                 hreflang="en"
                 href="http://markinstefan.xyz/tags/"
                 />
-    <xhtml:link
-                rel="alternate"
-                hreflang="ru"
-                href="http://markinstefan.xyz/ru/tags/"
-                />
   </url>
 </urlset>
diff --git a/public/rsvp-submit.php b/public/rsvp-submit.php
index 3dc58b0..b60ccf6 100755
--- a/public/rsvp-submit.php
+++ b/public/rsvp-submit.php
@@ -105,13 +105,23 @@ try {
     $mail->CharSet = 'UTF-8';
 
     $mail->isSMTP();
-    $mail->Host       = $_ENV['SMTP_HOST'];
-    $mail->SMTPAuth   = true;
-    $mail->Username   = $_ENV['SMTP_USER'];
-    $mail->Password   = $_ENV['SMTP_PASS'];
-    $mail->SMTPSecure = PHPMailer::ENCRYPTION_STARTTLS;
-    $mail->Port       = (int)$_ENV['SMTP_PORT'];
-    $mail->Timeout    = 10;
+
+$mail->Host = gethostbyname($_ENV['SMTP_HOST']);
+
+$mail->SMTPAuth = true;
+$mail->Username = $_ENV['SMTP_USER'];
+$mail->Password = $_ENV['SMTP_PASS'];
+
+$mail->SMTPSecure = PHPMailer::ENCRYPTION_STARTTLS;
+$mail->Port = (int)$_ENV['SMTP_PORT'];
+
+$mail->Timeout = 10;
+
+$mail->SMTPOptions = [
+    'ssl' => [
+        'peer_name' => $_ENV['SMTP_HOST']
+    ]
+];
 
     $mail->setFrom($_ENV['FROM_EMAIL'], $_ENV['FROM_NAME']);
     $mail->addAddress($_ENV['TO_EMAIL']);
diff --git a/public/ru/categories/index.html b/public/ru/categories/index.html
index 90c5031..fdd3de6 100755
--- a/public/ru/categories/index.html
+++ b/public/ru/categories/index.html
@@ -137,14 +137,14 @@
                 
               
               <li class="navigation-item">
-                <a href="/de/categories/">🇩🇪</a>
+                <a href="/categories/">🇬🇧</a>
               </li>
             
           
             
               
               <li class="navigation-item">
-                <a href="/categories/">🇬🇧</a>
+                <a href="/de/categories/">🇩🇪</a>
               </li>
             
           
diff --git a/public/ru/index.html b/public/ru/index.html
index a76c1ac..8266e40 100755
--- a/public/ru/index.html
+++ b/public/ru/index.html
@@ -138,14 +138,14 @@
                 
               
               <li class="navigation-item">
-                <a href="/de/">🇩🇪</a>
+                <a href="/">🇬🇧</a>
               </li>
             
           
             
               
               <li class="navigation-item">
-                <a href="/">🇬🇧</a>
+                <a href="/de/">🇩🇪</a>
               </li>
             
           
diff --git a/public/ru/series/index.html b/public/ru/series/index.html
index 6dbfdab..cee8a31 100755
--- a/public/ru/series/index.html
+++ b/public/ru/series/index.html
@@ -137,14 +137,14 @@
                 
               
               <li class="navigation-item">
-                <a href="/series/">🇬🇧</a>
+                <a href="/de/series/">🇩🇪</a>
               </li>
             
           
             
               
               <li class="navigation-item">
-                <a href="/de/series/">🇩🇪</a>
+                <a href="/series/">🇬🇧</a>
               </li>
             
           
diff --git a/public/ru/sitemap.xml b/public/ru/sitemap.xml
index 685feae..610dced 100755
--- a/public/ru/sitemap.xml
+++ b/public/ru/sitemap.xml
@@ -20,11 +20,6 @@
                 />
   </url><url>
     <loc>http://markinstefan.xyz/ru/categories/</loc>
-    <xhtml:link
-                rel="alternate"
-                hreflang="de"
-                href="http://markinstefan.xyz/de/categories/"
-                />
     <xhtml:link
                 rel="alternate"
                 hreflang="en"
@@ -35,8 +30,18 @@
                 hreflang="ru"
                 href="http://markinstefan.xyz/ru/categories/"
                 />
+    <xhtml:link
+                rel="alternate"
+                hreflang="de"
+                href="http://markinstefan.xyz/de/categories/"
+                />
   </url><url>
     <loc>http://markinstefan.xyz/ru/series/</loc>
+    <xhtml:link
+                rel="alternate"
+                hreflang="de"
+                href="http://markinstefan.xyz/de/series/"
+                />
     <xhtml:link
                 rel="alternate"
                 hreflang="en"
@@ -47,11 +52,6 @@
                 hreflang="ru"
                 href="http://markinstefan.xyz/ru/series/"
                 />
-    <xhtml:link
-                rel="alternate"
-                hreflang="de"
-                href="http://markinstefan.xyz/de/series/"
-                />
   </url><url>
     <loc>http://markinstefan.xyz/ru/tags/</loc>
     <xhtml:link
@@ -90,13 +90,13 @@
     <loc>http://markinstefan.xyz/ru/</loc>
     <xhtml:link
                 rel="alternate"
-                hreflang="de"
-                href="http://markinstefan.xyz/de/"
+                hreflang="en"
+                href="http://markinstefan.xyz/"
                 />
     <xhtml:link
                 rel="alternate"
-                hreflang="en"
-                href="http://markinstefan.xyz/"
+                hreflang="de"
+                href="http://markinstefan.xyz/de/"
                 />
     <xhtml:link
                 rel="alternate"
diff --git a/public/series/index.html b/public/series/index.html
index 82e0556..1d1f960 100755
--- a/public/series/index.html
+++ b/public/series/index.html
@@ -137,14 +137,14 @@
                 
               
               <li class="navigation-item">
-                <a href="/de/series/">🇩🇪</a>
+                <a href="/ru/series/">🇷🇺</a>
               </li>
             
           
             
               
               <li class="navigation-item">
-                <a href="/ru/series/">🇷🇺</a>
+                <a href="/de/series/">🇩🇪</a>
               </li>
             
           
diff --git a/public/tags/index.html b/public/tags/index.html
index 94fd14a..89eaf1f 100755
--- a/public/tags/index.html
+++ b/public/tags/index.html
@@ -137,14 +137,14 @@
                 
               
               <li class="navigation-item">
-                <a href="/de/tags/">🇩🇪</a>
+                <a href="/ru/tags/">🇷🇺</a>
               </li>
             
           
             
               
               <li class="navigation-item">
-                <a href="/ru/tags/">🇷🇺</a>
+                <a href="/de/tags/">🇩🇪</a>
               </li>
             
           
diff --git a/static/rsvp-submit.php b/static/rsvp-submit.php
index 3dc58b0..b60ccf6 100755
--- a/static/rsvp-submit.php
+++ b/static/rsvp-submit.php
@@ -105,13 +105,23 @@ try {
     $mail->CharSet = 'UTF-8';
 
     $mail->isSMTP();
-    $mail->Host       = $_ENV['SMTP_HOST'];
-    $mail->SMTPAuth   = true;
-    $mail->Username   = $_ENV['SMTP_USER'];
-    $mail->Password   = $_ENV['SMTP_PASS'];
-    $mail->SMTPSecure = PHPMailer::ENCRYPTION_STARTTLS;
-    $mail->Port       = (int)$_ENV['SMTP_PORT'];
-    $mail->Timeout    = 10;
+
+$mail->Host = gethostbyname($_ENV['SMTP_HOST']);
+
+$mail->SMTPAuth = true;
+$mail->Username = $_ENV['SMTP_USER'];
+$mail->Password = $_ENV['SMTP_PASS'];
+
+$mail->SMTPSecure = PHPMailer::ENCRYPTION_STARTTLS;
+$mail->Port = (int)$_ENV['SMTP_PORT'];
+
+$mail->Timeout = 10;
+
+$mail->SMTPOptions = [
+    'ssl' => [
+        'peer_name' => $_ENV['SMTP_HOST']
+    ]
+];
 
     $mail->setFrom($_ENV['FROM_EMAIL'], $_ENV['FROM_NAME']);
     $mail->addAddress($_ENV['TO_EMAIL']);