diff --git a/README.md b/README.md
index b3e6d9360..8efe4a91a 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 [Publii](https://getpublii.com/) is a desktop-based CMS for Windows, Mac and Linux that makes creating static websites fast
 and hassle-free, even for beginners.
 
-**Current version: 0.34.0 (build 11726)**
+**Current version: 0.34.1 (build 11733)**
 
 ## Why Publii?
 Unlike static-site generators that are often unwieldy and difficult to use, Publii provides an
diff --git a/app/back-end/builddata.json b/app/back-end/builddata.json
index 7fe4dd6d6..e28cab713 100644
--- a/app/back-end/builddata.json
+++ b/app/back-end/builddata.json
@@ -1 +1 @@
-{"version":"0.34.0","build":11726,"status":"Beta"}
+{"version":"0.34.1","build":11733,"status":"Beta"}
diff --git a/app/back-end/modules/render-html/helpers/sitemap.js b/app/back-end/modules/render-html/helpers/sitemap.js
index 210efa6b8..1e3e475a5 100644
--- a/app/back-end/modules/render-html/helpers/sitemap.js
+++ b/app/back-end/modules/render-html/helpers/sitemap.js
@@ -145,7 +145,7 @@ class Sitemap {
      * Retrieves media path for the website
      */
     getMediaPath (postObject) {
-        return this.siteConfig.domain + '/' + path.join('media', 'posts', (postObject.id).toString());
+        return this.siteConfig.domain + '/' + path.join('media', 'posts', (postObject.id).toString()) + '/';
     }
 
     /**
@@ -450,7 +450,7 @@ class Sitemap {
                         this.fileList.push({
                             images: this.postData[file].images,
                             lastMod: this.postData[file].lastMod,
-                            url: file
+                            url: file + '/'
                         });
                     } else {
                         this.fileList.push(file + '/');
diff --git a/app/default-files/default-themes/simple/assets/css/main.css b/app/default-files/default-themes/simple/assets/css/main.css
index e772ce772..bb2892951 100755
--- a/app/default-files/default-themes/simple/assets/css/main.css
+++ b/app/default-files/default-themes/simple/assets/css/main.css
@@ -791,48 +791,44 @@ textarea {
       position: relative;
       text-transform: uppercase;
       width: auto; }
-      .navbar .navbar__menu li a {
+      .navbar .navbar__menu li a,
+      .navbar .navbar__menu li span[aria-haspopup="true"] {
         color: #FFFFFF;
         display: block;
         padding: 0 0.56667rem;
         -webkit-transition: all 0.24s ease-out;
         -o-transition: all 0.24s ease-out;
         transition: all 0.24s ease-out; }
-        .navbar .navbar__menu li a:active, .navbar .navbar__menu li a:focus, .navbar .navbar__menu li a:hover {
+        .navbar .navbar__menu li a:active, .navbar .navbar__menu li a:focus, .navbar .navbar__menu li a:hover,
+        .navbar .navbar__menu li span[aria-haspopup="true"]:active,
+        .navbar .navbar__menu li span[aria-haspopup="true"]:focus,
+        .navbar .navbar__menu li span[aria-haspopup="true"]:hover {
           color: rgba(255, 255, 255, 0.7); }
       .navbar .navbar__menu li span {
         color: #FFFFFF;
+        cursor: default;
         display: block;
         padding: 0 0.56667rem; }
     .navbar .navbar__menu > li:hover > a,
-    .navbar .navbar__menu > li:hover > span {
+    .navbar .navbar__menu > li:hover > span[aria-haspopup="true"] {
       color: rgba(255, 255, 255, 0.7); }
   .navbar .has-submenu:active > .navbar__submenu,
   .navbar .has-submenu:focus > .navbar__submenu,
   .navbar .has-submenu:hover > .navbar__submenu {
-    left: 0; }
-    @media all and (min-width: 56.25em) {
-      .navbar .has-submenu:active > .navbar__submenu,
-      .navbar .has-submenu:focus > .navbar__submenu,
-      .navbar .has-submenu:hover > .navbar__submenu {
-        opacity: 1;
-        -webkit-transform-origin: 0 top;
-        -ms-transform-origin: 0 top;
-        transform-origin: 0 top;
-        -webkit-transform: none;
-        -ms-transform: none;
-        transform: none;
-        -webkit-transition: -webkit-transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1);
-        transition: -webkit-transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1);
-        -o-transition: transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1);
-        transition: transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1);
-        transition: transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1), -webkit-transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1);
-        visibility: visible; } }
+    left: 0;
+    opacity: 1;
+    -webkit-transform: scale(1);
+    -ms-transform: scale(1);
+    transform: scale(1);
+    visibility: visible; }
   .navbar .has-submenu:active > .navbar__submenu.is-right-submenu,
   .navbar .has-submenu:focus > .navbar__submenu.is-right-submenu,
   .navbar .has-submenu:hover > .navbar__submenu.is-right-submenu {
     left: auto;
-    right: 0; }
+    right: 0;
+    -webkit-transform-origin: right top;
+    -ms-transform-origin: right top;
+    transform-origin: right top; }
   .navbar .has-submenu .has-submenu:active > .navbar__submenu,
   .navbar .has-submenu .has-submenu:focus > .navbar__submenu,
   .navbar .has-submenu .has-submenu:hover > .navbar__submenu {
@@ -851,26 +847,43 @@ textarea {
     padding: 10px 0;
     position: absolute;
     white-space: nowrap;
-    z-index: 1; }
-    @media all and (min-width: 56.25em) {
-      .navbar .navbar__submenu {
-        -webkit-transform: scale(0.8);
-        -ms-transform: scale(0.8);
-        transform: scale(0.8); } }
+    z-index: 1;
+    opacity: 0;
+    -webkit-transform: scale(0.8);
+    -ms-transform: scale(0.8);
+    transform: scale(0.8);
+    -webkit-transform-origin: 0 top;
+    -ms-transform-origin: 0 top;
+    transform-origin: 0 top;
+    -webkit-transition: opacity 0.15s, -webkit-transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1);
+    transition: opacity 0.15s, -webkit-transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1);
+    -o-transition: opacity 0.15s, transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1);
+    transition: opacity 0.15s, transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1);
+    transition: opacity 0.15s, transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1), -webkit-transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1); }
     .navbar .navbar__submenu__submenu {
       z-index: 2; }
     .navbar .navbar__submenu li {
       line-height: 1.5;
       font-size: 0.7242rem; }
-      .navbar .navbar__submenu li a {
-        color: rgba(255, 255, 255, 0.7);
-        padding: 0.56667rem 1.41667rem; }
-        .navbar .navbar__submenu li a:active, .navbar .navbar__submenu li a:focus, .navbar .navbar__submenu li a:hover {
+      .navbar .navbar__submenu li a,
+      .navbar .navbar__submenu li span[aria-haspopup="true"] {
+        color: rgba(255, 255, 255, 0.7) !important;
+        padding: 0.56667rem 1.41667rem;
+        -webkit-transition: all 0.24s ease;
+        -o-transition: all 0.24s ease;
+        transition: all 0.24s ease; }
+        .navbar .navbar__submenu li a:active, .navbar .navbar__submenu li a:focus, .navbar .navbar__submenu li a:hover,
+        .navbar .navbar__submenu li span[aria-haspopup="true"]:active,
+        .navbar .navbar__submenu li span[aria-haspopup="true"]:focus,
+        .navbar .navbar__submenu li span[aria-haspopup="true"]:hover {
           background: rgba(255, 255, 255, 0.05);
-          color: #FFFFFF; }
+          color: #FFFFFF !important; }
       .navbar .navbar__submenu li span {
-        color: rgba(255, 255, 255, 0.7);
+        color: rgba(255, 255, 255, 0.7) !important;
         padding: 0.56667rem 1.41667rem; }
+      .navbar .navbar__submenu li:hover > a,
+      .navbar .navbar__submenu li:hover > span[aria-haspopup="true"] {
+        color: #FFFFFF !important; }
   .navbar .navbar__toggle {
     background: #17181E;
     -webkit-box-shadow: none;
diff --git a/app/default-files/default-themes/simple/assets/css/style.css b/app/default-files/default-themes/simple/assets/css/style.css
index 34ccc3f0e..97d77c86f 100755
--- a/app/default-files/default-themes/simple/assets/css/style.css
+++ b/app/default-files/default-themes/simple/assets/css/style.css
@@ -791,48 +791,44 @@ textarea {
       position: relative;
       text-transform: uppercase;
       width: auto; }
-      .navbar .navbar__menu li a {
+      .navbar .navbar__menu li a,
+      .navbar .navbar__menu li span[aria-haspopup="true"] {
         color: #FFFFFF;
         display: block;
         padding: 0 0.56667rem;
         -webkit-transition: all 0.24s ease-out;
         -o-transition: all 0.24s ease-out;
         transition: all 0.24s ease-out; }
-        .navbar .navbar__menu li a:active, .navbar .navbar__menu li a:focus, .navbar .navbar__menu li a:hover {
+        .navbar .navbar__menu li a:active, .navbar .navbar__menu li a:focus, .navbar .navbar__menu li a:hover,
+        .navbar .navbar__menu li span[aria-haspopup="true"]:active,
+        .navbar .navbar__menu li span[aria-haspopup="true"]:focus,
+        .navbar .navbar__menu li span[aria-haspopup="true"]:hover {
           color: rgba(255, 255, 255, 0.7); }
       .navbar .navbar__menu li span {
         color: #FFFFFF;
+        cursor: default;
         display: block;
         padding: 0 0.56667rem; }
     .navbar .navbar__menu > li:hover > a,
-    .navbar .navbar__menu > li:hover > span {
+    .navbar .navbar__menu > li:hover > span[aria-haspopup="true"] {
       color: rgba(255, 255, 255, 0.7); }
   .navbar .has-submenu:active > .navbar__submenu,
   .navbar .has-submenu:focus > .navbar__submenu,
   .navbar .has-submenu:hover > .navbar__submenu {
-    left: 0; }
-    @media all and (min-width: 56.25em) {
-      .navbar .has-submenu:active > .navbar__submenu,
-      .navbar .has-submenu:focus > .navbar__submenu,
-      .navbar .has-submenu:hover > .navbar__submenu {
-        opacity: 1;
-        -webkit-transform-origin: 0 top;
-        -ms-transform-origin: 0 top;
-        transform-origin: 0 top;
-        -webkit-transform: none;
-        -ms-transform: none;
-        transform: none;
-        -webkit-transition: -webkit-transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1);
-        transition: -webkit-transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1);
-        -o-transition: transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1);
-        transition: transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1);
-        transition: transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1), -webkit-transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1);
-        visibility: visible; } }
+    left: 0;
+    opacity: 1;
+    -webkit-transform: scale(1);
+    -ms-transform: scale(1);
+    transform: scale(1);
+    visibility: visible; }
   .navbar .has-submenu:active > .navbar__submenu.is-right-submenu,
   .navbar .has-submenu:focus > .navbar__submenu.is-right-submenu,
   .navbar .has-submenu:hover > .navbar__submenu.is-right-submenu {
     left: auto;
-    right: 0; }
+    right: 0;
+    -webkit-transform-origin: right top;
+    -ms-transform-origin: right top;
+    transform-origin: right top; }
   .navbar .has-submenu .has-submenu:active > .navbar__submenu,
   .navbar .has-submenu .has-submenu:focus > .navbar__submenu,
   .navbar .has-submenu .has-submenu:hover > .navbar__submenu {
@@ -851,26 +847,43 @@ textarea {
     padding: 10px 0;
     position: absolute;
     white-space: nowrap;
-    z-index: 1; }
-    @media all and (min-width: 56.25em) {
-      .navbar .navbar__submenu {
-        -webkit-transform: scale(0.8);
-        -ms-transform: scale(0.8);
-        transform: scale(0.8); } }
+    z-index: 1;
+    opacity: 0;
+    -webkit-transform: scale(0.8);
+    -ms-transform: scale(0.8);
+    transform: scale(0.8);
+    -webkit-transform-origin: 0 top;
+    -ms-transform-origin: 0 top;
+    transform-origin: 0 top;
+    -webkit-transition: opacity 0.15s, -webkit-transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1);
+    transition: opacity 0.15s, -webkit-transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1);
+    -o-transition: opacity 0.15s, transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1);
+    transition: opacity 0.15s, transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1);
+    transition: opacity 0.15s, transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1), -webkit-transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1); }
     .navbar .navbar__submenu__submenu {
       z-index: 2; }
     .navbar .navbar__submenu li {
       line-height: 1.5;
       font-size: 0.7242rem; }
-      .navbar .navbar__submenu li a {
-        color: rgba(255, 255, 255, 0.7);
-        padding: 0.56667rem 1.41667rem; }
-        .navbar .navbar__submenu li a:active, .navbar .navbar__submenu li a:focus, .navbar .navbar__submenu li a:hover {
+      .navbar .navbar__submenu li a,
+      .navbar .navbar__submenu li span[aria-haspopup="true"] {
+        color: rgba(255, 255, 255, 0.7) !important;
+        padding: 0.56667rem 1.41667rem;
+        -webkit-transition: all 0.24s ease;
+        -o-transition: all 0.24s ease;
+        transition: all 0.24s ease; }
+        .navbar .navbar__submenu li a:active, .navbar .navbar__submenu li a:focus, .navbar .navbar__submenu li a:hover,
+        .navbar .navbar__submenu li span[aria-haspopup="true"]:active,
+        .navbar .navbar__submenu li span[aria-haspopup="true"]:focus,
+        .navbar .navbar__submenu li span[aria-haspopup="true"]:hover {
           background: rgba(255, 255, 255, 0.05);
-          color: #FFFFFF; }
+          color: #FFFFFF !important; }
       .navbar .navbar__submenu li span {
-        color: rgba(255, 255, 255, 0.7);
+        color: rgba(255, 255, 255, 0.7) !important;
         padding: 0.56667rem 1.41667rem; }
+      .navbar .navbar__submenu li:hover > a,
+      .navbar .navbar__submenu li:hover > span[aria-haspopup="true"] {
+        color: #FFFFFF !important; }
   .navbar .navbar__toggle {
     background: #17181E;
     -webkit-box-shadow: none;
@@ -2000,31 +2013,38 @@ img[data-sizes="auto"] {
         }
         .navbar .navbar__menu li a:active,
         .navbar .navbar__menu li a:focus,
-        .navbar .navbar__menu li a:hover  {
+        .navbar .navbar__menu li a:hover,
+        .navbar .navbar__menu li span[aria-haspopup="true"]:active,
+        .navbar .navbar__menu li span[aria-haspopup="true"]:focus,
+        .navbar .navbar__menu li span[aria-haspopup="true"]:hover   {
                color: rgba(255,255,255,0.7);
         }      
 
         .navbar .navbar__menu > li:hover > a,
-        .navbar .navbar__menu > li:hover > span {
-               color: rgba(255,255,255,0.7);  
-        }
-
-        .search__btn:hover > svg,
-        .search__btn:focus > svg {
-               fill: rgba(255,255,255,0.7);  
-        }
-         .navbar .navbar__submenu li a {
+        .navbar .navbar__menu > li:hover > span[aria-haspopup="true"] {
                color: rgba(255,255,255,0.7);  
+                 }
+         .navbar .navbar__submenu li a,
+         .navbar .navbar__submenu li span[aria-haspopup="true"] {
+               color: rgba(255,255,255,0.7) !important;  
          }
 
          .navbar .navbar__submenu li span {
-               color: rgba(255,255,255,0.7); 
+               color: rgba(255,255,255,0.7) !important; 
         }
          .navbar .navbar__submenu li a:active,
          .navbar .navbar__submenu li a:focus,
-         .navbar .navbar__submenu li a:hover {
+         .navbar .navbar__submenu li a:hover,
+         .navbar .navbar__submenu li span[aria-haspopup="true"]:active,
+         .navbar .navbar__submenu li span[aria-haspopup="true"]:focus,
+         .navbar .navbar__submenu li span[aria-haspopup="true"]:hover {
                background: rgba(255,255,255,0.05);     
-               color: #FFFFFF;             
+               color: #FFFFFF !important;    
+         }
+
+         .navbar .navbar__submenu li:hover > a,
+         .navbar .navbar__submenu li:hover > span[aria-haspopup="true"] {
+               color: #FFFFFF !important;  
         }
            .hero__image--overlay::after {              
                   background: linear-gradient(to bottom, transparent 0%, rgba(0, 0, 0, 0.64) 100%);
diff --git a/app/default-files/default-themes/simple/config.json b/app/default-files/default-themes/simple/config.json
index 9a4cf2673..29639dd46 100755
--- a/app/default-files/default-themes/simple/config.json
+++ b/app/default-files/default-themes/simple/config.json
@@ -1,6 +1,6 @@
 {
     "name": "Simple",
-    "version": "2.0.0.0",
+    "version": "2.0.1.0",
     "author": "TidyCustoms <https://tidycustoms.net/>",
     "menus": {
         "mainMenu": "Main menu"
diff --git a/app/default-files/default-themes/simple/partials/menu.hbs b/app/default-files/default-themes/simple/partials/menu.hbs
index 4586cd813..c48d285d6 100755
--- a/app/default-files/default-themes/simple/partials/menu.hbs
+++ b/app/default-files/default-themes/simple/partials/menu.hbs
@@ -10,7 +10,7 @@
          </span>
       </button>
    {{/unless}}
-    <ul{{#if level}} class="navbar__submenu" aria-hidden="true" {{else}} class="navbar__menu"{{/if}}>
+    <ul{{#if level}} class="navbar__submenu level-{{level}}" aria-hidden="true" {{else}} class="navbar__menu"{{/if}}>
         {{#each items}}
              <li{{menuItemClasses}}>
             {{#if link}}
diff --git a/app/default-files/default-themes/simple/visual-override.js b/app/default-files/default-themes/simple/visual-override.js
index 6dbd72918..07d8f71d9 100755
--- a/app/default-files/default-themes/simple/visual-override.js
+++ b/app/default-files/default-themes/simple/visual-override.js
@@ -172,22 +172,14 @@ var generateOverride = function (params) {
 
     if (params.linkColorMenu !== '#FFFFFF') {
         output += `
-        .navbar .navbar__menu li a {
+        .navbar .navbar__menu li a,
+        .navbar .navbar__menu li span[aria-haspopup="true"] {
                color: ${params.linkColorMenu};
         }
 
         .navbar .navbar__menu li span {
                color: ${params.linkColorMenu};
-        }
-
-        .navbar .navbar__toggle-inner,
-        .navbar .navbar__toggle-inner::before,
-        .navbar .navbar__toggle-inner::after {
-               background-color: ${params.linkColorMenu};
-        }
-
-        .search__btn > svg {
-               fill: ${params.linkColorMenu};
+        
         }`;
     }
 
@@ -195,19 +187,17 @@ var generateOverride = function (params) {
         output += `
         .navbar .navbar__menu li a:active,
         .navbar .navbar__menu li a:focus,
-        .navbar .navbar__menu li a:hover  {
+        .navbar .navbar__menu li a:hover,
+        .navbar .navbar__menu li span[aria-haspopup="true"]:active,
+        .navbar .navbar__menu li span[aria-haspopup="true"]:focus,
+        .navbar .navbar__menu li span[aria-haspopup="true"]:hover   {
                color: ${params.linkHoverColorMenu};
         }      
 
         .navbar .navbar__menu > li:hover > a,
-        .navbar .navbar__menu > li:hover > span {
+        .navbar .navbar__menu > li:hover > span[aria-haspopup="true"] {
                color: ${params.linkHoverColorMenu};  
-        }
-
-        .search__btn:hover > svg,
-        .search__btn:focus > svg {
-               fill: ${params.linkHoverColorMenu};  
-        }`;
+                 }`;
     }
     
     if (params.submenu === 'custom') {
@@ -236,12 +226,13 @@ var generateOverride = function (params) {
     
     if(params.submenuLinkColor !== 'rgba(255, 255, 255, 0.7)') {
         output += `
-         .navbar .navbar__submenu li a {
-               color: ${params.submenuLinkColor};  
+         .navbar .navbar__submenu li a,
+         .navbar .navbar__submenu li span[aria-haspopup="true"] {
+               color: ${params.submenuLinkColor} !important;  
          }
 
          .navbar .navbar__submenu li span {
-               color: ${params.submenuLinkColor}; 
+               color: ${params.submenuLinkColor} !important; 
         }`;
     }
     
@@ -249,9 +240,17 @@ var generateOverride = function (params) {
         output += `
          .navbar .navbar__submenu li a:active,
          .navbar .navbar__submenu li a:focus,
-         .navbar .navbar__submenu li a:hover {
+         .navbar .navbar__submenu li a:hover,
+         .navbar .navbar__submenu li span[aria-haspopup="true"]:active,
+         .navbar .navbar__submenu li span[aria-haspopup="true"]:focus,
+         .navbar .navbar__submenu li span[aria-haspopup="true"]:hover {
                background: ${params.submenuLinkHoverBgMenu};     
-               color: ${params.submenuLinkHoverColor};             
+               color: ${params.submenuLinkHoverColor} !important;    
+         }
+
+         .navbar .navbar__submenu li:hover > a,
+         .navbar .navbar__submenu li:hover > span[aria-haspopup="true"] {
+               color: ${params.submenuLinkHoverColor} !important;  
         }`;
     }
 
diff --git a/app/package-lock.json b/app/package-lock.json
index 52ea1cc94..b765e3030 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "Publii",
-  "version": "0.34.0",
+  "version": "0.34.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/app/package.json b/app/package.json
index 3d834a4d8..9fe19365c 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,7 +1,7 @@
 {
   "productName": "Publii",
   "name": "Publii",
-  "version": "0.34.0",
+  "version": "0.34.1",
   "description": "Static Site CMS",
   "main": "main.js",
   "scripts": {
diff --git a/app/src/components/Backups.vue b/app/src/components/Backups.vue
index 7b6cdeb69..e4dcf3c65 100644
--- a/app/src/components/Backups.vue
+++ b/app/src/components/Backups.vue
@@ -372,6 +372,12 @@ export default {
             ipcRenderer.once('app-backup-created', (event, data) => {
                 if (data.status) {
                     this.items = data.backups;
+
+                    this.$bus.$emit('message-display', {
+                        message: 'Backup has been created.',
+                        type: 'success',
+                        lifeTime: 3
+                    });
                 } else {
                     this.$bus.$emit('message-display', {
                         message: 'An error occurred during backup creation. Please try again.',
diff --git a/app/src/components/post-editor/InlineEditor.vue b/app/src/components/post-editor/InlineEditor.vue
index 23cb5bbe2..fcfd1e8c0 100644
--- a/app/src/components/post-editor/InlineEditor.vue
+++ b/app/src/components/post-editor/InlineEditor.vue
@@ -89,6 +89,12 @@ export default {
 
                 if (response.rel) {
                     relAttr = ' rel="nofollow"';
+
+                    if (response.target.indexOf('_blank') > -1) {
+                        relAttr = ' rel="nofollow noopener noreferrer"';
+                    }
+                } else if (response.target.indexOf('_blank') > -1) {
+                    relAttr = ' rel="noopener noreferrer"';
                 }
 
                 let linkHTML = `<a href="${response.url}"${response.title}${response.target}${relAttr}>${response.text}</a>`;
diff --git a/app/src/components/post-editor/LinkPopup.vue b/app/src/components/post-editor/LinkPopup.vue
index 6c6412660..d371ffa84 100644
--- a/app/src/components/post-editor/LinkPopup.vue
+++ b/app/src/components/post-editor/LinkPopup.vue
@@ -269,7 +269,7 @@ export default {
                 }
             }
 
-            if (relContent && relContent[1]) {
+            if (relContent && relContent[1].indexOf('nofollow') > -1) {
                 this.rel = true;
             }
         },
diff --git a/app/src/components/post-editor/LinkToolbar.vue b/app/src/components/post-editor/LinkToolbar.vue
index a78ceb26b..78e1dd9a0 100644
--- a/app/src/components/post-editor/LinkToolbar.vue
+++ b/app/src/components/post-editor/LinkToolbar.vue
@@ -46,6 +46,12 @@ export default {
 
                 if (response.rel) {
                     relAttr = ' rel="nofollow"';
+
+                    if (response.target.indexOf('_blank') > -1) {
+                        relAttr = ' rel="nofollow noopener noreferrer"';
+                    }
+                } else if (response.target.indexOf('_blank') > -1) {
+                    relAttr = ' rel="noopener noreferrer"';
                 }
 
                 let linkHTML = `<a href="${response.url}"${response.title}${response.target}${relAttr}>${response.text}</a>`;
diff --git a/package-lock.json b/package-lock.json
index e4743a84f..0e9f12332 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "Publii",
-  "version": "0.34.0",
+  "version": "0.34.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 7cf12a77d..8abbcc867 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "productName": "Publii",
   "name": "Publii",
-  "version": "0.34.0",
+  "version": "0.34.1",
   "description": "Static Site CMS",
   "homepage": "https://getpublii.com",
   "author": {
@@ -17,7 +17,7 @@
     "build": "cross-env NODE_ENV=development gulp build",
     "start": "electron app/main.js --enable-logging",
     "test": "mocha app/back-end/**/*.spec.js --reporter dot",
-    "packager:win": "cross-env NODE_ENV=production electron-packager ./app Publii --platform=win32 --arch=x64 --asar.unpack=\"*.+(dylib|node|dll)\" --asar.unpackDir=\"default-files/default-themes/**/*\"  --ignore=app/node_modules/electron-* --ignore=app/node_modules/devtron --ignore=app/node_modules/accessibility-developer-tools --ignore=app/node_modules/babel* --ignore=app/node_modules/asn1  --ignore=app/node_modules/postcss* --electron-version=3.1.8 --overwrite --symlinks --app-version=0.34.0 --icon=app/src/assets/installation/icon.ico --app-bundle-id=TidyCustoms --helper-bundle-id=TidyCustoms --version-string.CompanyName=\"TidyCustoms\" --version-string.ProductName=Publii --version-string.FileDescription=Publii --version-string.LegalCopyright=\"Copyright (C) 2018 TidyCustoms. All rights reserved.\" --version-string.ProductVersion=0.34.0 --version-string.FileVersion=0.34.0 --version-string.InternalName=Publii --version-string.OriginalFilename=Publii",
+    "packager:win": "cross-env NODE_ENV=production electron-packager ./app Publii --platform=win32 --arch=x64 --asar.unpack=\"*.+(dylib|node|dll)\" --asar.unpackDir=\"default-files/default-themes/**/*\"  --ignore=app/node_modules/electron-* --ignore=app/node_modules/devtron --ignore=app/node_modules/accessibility-developer-tools --ignore=app/node_modules/babel* --ignore=app/node_modules/asn1  --ignore=app/node_modules/postcss* --electron-version=3.1.8 --overwrite --symlinks --app-version=0.34.1 --icon=app/src/assets/installation/icon.ico --app-bundle-id=TidyCustoms --helper-bundle-id=TidyCustoms --version-string.CompanyName=\"TidyCustoms\" --version-string.ProductName=Publii --version-string.FileDescription=Publii --version-string.LegalCopyright=\"Copyright (C) 2018 TidyCustoms. All rights reserved.\" --version-string.ProductVersion=0.34.1 --version-string.FileVersion=0.34.1 --version-string.InternalName=Publii --version-string.OriginalFilename=Publii",
     "packager:osx": "cross-env NODE_ENV=production electron-packager ./app Publii --platform=darwin --arch=x64 --asar.unpack=\"*.+(dylib|node|dll)\" --asar.unpackDir=\"default-files/default-themes/**/*\" --ignore=app/node_modules/electron-* --electron-version=3.1.8 --ignore=app/node_modules/devtron --ignore=app/node_modules/accessibility-developer-tools --ignore=app/node_modules/babel* --ignore=app/node_modules/asn1  --ignore=app/node_modules/postcss* --overwrite --symlinks --icon app/src/assets/installation/icon.icns --osx-sign; electron-osx-flat Publii-darwin-x64/Publii.app",
     "packager:linux": "cross-env NODE_ENV=production electron-packager ./app Publii --platform=linux --arch=x64 --asar.unpack=\"*.+(dylib|node|dll)\" --asar.unpackDir=\"default-files/default-themes/**/*\" --ignore=app/node_modules/electron-* --electron-version=3.1.8 --ignore=app/node_modules/devtron --ignore=app/node_modules/accessibility-developer-tools --ignore=app/node_modules/babel* --ignore=app/node_modules/asn1  --ignore=app/node_modules/postcss* --overwrite --symlinks",
     "postinstall": "opencollective postinstall",
diff --git a/publii.iss b/publii.iss
index fa1cf9650..ecd2f1c78 100644
--- a/publii.iss
+++ b/publii.iss
@@ -11,7 +11,7 @@ Type: filesandordirs; Name: "{app}\resources";
 
 [Setup]
 AppName=Publii
-AppVersion=0.34.0
+AppVersion=0.34.1
 DefaultDirName={pf}\Publii
 DefaultGroupName=Publii
 UninstallDisplayIcon={app}\Publii.exe