diff --git a/resources/nsis/NSIS.definitions.nsh.in b/resources/nsis/NSIS.definitions.nsh.in
index cffdcf855..19b5073bd 100755
--- a/resources/nsis/NSIS.definitions.nsh.in
+++ b/resources/nsis/NSIS.definitions.nsh.in
@@ -1,6 +1,6 @@
 ; This file is part of RSS Guard.
 ;
-; Copyright (C) 2011-2015 by Martin Rotter <rotter.martinos@gmail.com>
+; Copyright (C) 2011-2021 by Martin Rotter <rotter.martinos@gmail.com>
 ;
 ; RSS Guard is free software: you can redistribute it and/or modify
 ; it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 !define APP_VERSION "@APP_VERSION@"
 !define APP_NAME "@APP_NAME@"
 !define EXE_NAME "@EXE_NAME@"
-!define README_FILE "README"
+;!define README_FILE "README"
 !define LICENSE_FILE "@PWD@\..\..\resources\text\COPYING_GNU_GPL"
 !define MUI_ICON "@PWD@\..\..\resources\graphics\@APP_LOW_NAME@.ico"
 !define MUI_UNICON "@PWD@\..\..\resources\graphics\@APP_LOW_NAME@.ico"
diff --git a/resources/nsis/NSIS.template.in b/resources/nsis/NSIS.template.in
index 5885a6c21..800d7190e 100755
--- a/resources/nsis/NSIS.template.in
+++ b/resources/nsis/NSIS.template.in
@@ -1,6 +1,6 @@
 ; This file is part of RSS Guard.
 ;
-; Copyright (C) 2011-2014 by Martin Rotter <rotter.martinos@gmail.com>
+; Copyright (C) 2011-2021 by Martin Rotter <rotter.martinos@gmail.com>
 ;
 ; RSS Guard is free software: you can redistribute it and/or modify
 ; it under the terms of the GNU General Public License as published by
@@ -15,6 +15,9 @@
 ; You should have received a copy of the GNU General Public License
 ; along with RSS Guard. If not, see <http:;www.gnu.org/licenses/>.
 
+;--------------------------------
+; Unicode baby.
+Unicode True
 
 ;--------------------------------
 ; Do necessary inclusions.
diff --git a/resources/scripts/7za b/resources/scripts/7za
index 47f412575..9c10723bf 160000
--- a/resources/scripts/7za
+++ b/resources/scripts/7za
@@ -1 +1 @@
-Subproject commit 47f4125753452eff8800dbd6600c5a05540b15d9
+Subproject commit 9c10723bfbaf6cb85107d6ee16e0324e9e487749
diff --git a/src/librssguard/services/standard/gui/formeditstandardaccount.cpp b/src/librssguard/services/standard/gui/formeditstandardaccount.cpp
index 674cc31e9..ad624aa51 100755
--- a/src/librssguard/services/standard/gui/formeditstandardaccount.cpp
+++ b/src/librssguard/services/standard/gui/formeditstandardaccount.cpp
@@ -15,7 +15,3 @@ void FormEditStandardAccount::apply() {
   applyInternal<StandardServiceRoot>();
   accept();
 }
-
-void FormEditStandardAccount::setEditableAccount(ServiceRoot* editable_account) {
-  FormAccountDetails::setEditableAccount(editable_account);
-}
diff --git a/src/librssguard/services/standard/gui/formeditstandardaccount.h b/src/librssguard/services/standard/gui/formeditstandardaccount.h
index 0587c453c..354231d35 100755
--- a/src/librssguard/services/standard/gui/formeditstandardaccount.h
+++ b/src/librssguard/services/standard/gui/formeditstandardaccount.h
@@ -11,9 +11,6 @@ class FormEditStandardAccount : public FormAccountDetails {
 
   protected slots:
     virtual void apply();
-
-  protected:
-    virtual void setEditableAccount(ServiceRoot* editable_account);
 };
 
 #endif // FORMEDITSTANDARDACCOUNT_H
diff --git a/src/rssguard/rssguard.pro b/src/rssguard/rssguard.pro
index c31b157fd..33992107a 100644
--- a/src/rssguard/rssguard.pro
+++ b/src/rssguard/rssguard.pro
@@ -52,11 +52,11 @@ unix: LIBS += -L$$OUT_PWD/../librssguard/ -lrssguard
 
 win32 {
   # Prepare files for NSIS.
-  SEDREPLACE = "s|@APP_VERSION@|$$APP_VERSION|g; s|@APP_WIN_ARCH@|$$APP_WIN_ARCH|g; s|@APP_REVISION@|$$APP_REVISION|g; s|@APP_NAME@|$$APP_NAME|g; s|@APP_LOW_NAME@|$$APP_LOW_NAME|g; s|@EXE_NAME@|$${APP_LOW_NAME}.exe|g; s|@PWD@|$$replace(PWD, /, \\\\)|g; s|@OUT_PWD@|$$replace(OUT_PWD, /, \\\\)|g"
+  SEDREPLACE = "| ForEach-Object { $_ -replace '@APP_VERSION@', '$$APP_VERSION' -replace '@APP_WIN_ARCH@', '$$APP_WIN_ARCH' -replace '@APP_REVISION@', '$$APP_REVISION' -replace '@APP_NAME@', '$$APP_NAME' -replace '@APP_LOW_NAME@', '$$APP_LOW_NAME' -replace '@EXE_NAME@', '$${APP_LOW_NAME}.exe' -replace '@PWD@', '$$replace(PWD, /, \\\\)' -replace '@OUT_PWD@', '$$replace(OUT_PWD, /, \\\\)' }"
   message($$MSG_PREFIX: Sed replace string: \"$$SEDREPLACE\")
 
-  FULLSEDCMD = "$$shell_path($$shell_quote($$PWD/../../resources/scripts/sed/sed.exe)) -e \"$$SEDREPLACE\" \"$$shell_path($$shell_quote($$PWD/../../resources/nsis/NSIS.definitions.nsh.in))\" > \"$$shell_path($$shell_quote($$OUT_PWD/NSIS.definitions.nsh))\""
-  message($$MSG_PREFIX: Full sed command: $$FULLSEDCMD)
+  FULLSEDCMD = "powershell -Command \"cat $$shell_path($$shell_quote($$PWD/../../resources/nsis/NSIS.definitions.nsh.in)) $$SEDREPLACE | Out-File $$shell_path($$shell_quote($$OUT_PWD/NSIS.definitions.nsh))\""
+  message($$MSG_PREFIX: Full powershell command: $$FULLSEDCMD)
 
   system(xcopy /Y $$shell_path($$shell_quote($$PWD/../../resources/nsis/NSIS.template.in)) $$shell_path($$shell_quote($$OUT_PWD/)))
   system($$FULLSEDCMD)