diff --git a/.appveyor.yml b/.appveyor.yml
index 25ad9f440..176275cdd 100755
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -9,7 +9,7 @@ branches:
     - master
 
 environment:
-  QTDIR: 'C:\Qt\5.8\msvc2015'
+  QTDIR: 'C:\Qt\5.9.1\msvc2015'
   QMAKESPEC: win32-msvc2015
   COMPILERBAT: '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86'
   access_token:
diff --git a/.astylerc b/.astylerc
deleted file mode 100755
index 310eab12b..000000000
--- a/.astylerc
+++ /dev/null
@@ -1,25 +0,0 @@
---style=java
---indent=spaces=2
---indent-classes
---indent-namespaces
---indent-switches
---indent-labels
---indent-preproc-define
---indent-col1-comments
---max-continuation-indent=100
---break-blocks
---unpad-paren
---pad-oper
---pad-comma
---pad-header
---align-pointer=type
---align-reference=type
---break-closing-braces
---break-one-line-headers
---add-braces
---convert-tabs
---close-templates
---max-code-length=140
---lineend=linux
--t -p
--M60Ucv
\ No newline at end of file
diff --git a/astyle-format-all.sh b/astyle-format-all.sh
deleted file mode 100755
index 628b0a731..000000000
--- a/astyle-format-all.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-#
-# This file is part of RSS Guard.
-#
-# Copyright (C) 2011-2017 by Martin Rotter <rotter.martinos@gmail.com>
-# Copyright (C) 2010-2014 by David Rosca <nowrep@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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# RSS Guard is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with RSS Guard. If not, see <http:#www.gnu.org/licenses/>.
-
-function usage {
-  echo "Usage: $0 \"root-directory\"..."
-  exit 1
-}
-
-if [ $# -eq 0 ]; then
-  usage
-fi
-
-ASTYLE_CMD="astyle"
-ASTYLE_RC=".astylerc"
-
-# Check all args.
-for dir in "$@"; do
-    if [ ! -d "${dir}" ]; then
-        echo "\"${dir}\" is not a directory..."
-        usage
-    fi
-done
-
-# Run the thing.
-for dir in "$@"; do
-  pushd "${dir}"
-  
-  if [ ! -r "$ASTYLE_RC" ]; then
-    echo "No $ASTYLE_RC in pwd \"$PWD\"..."
-    continue
-  fi
-  
-  for f in $(find . \
-                -name '*.c' \
-                -o -name '*.cc' \
-                -o -name '*.cpp' \
-                -o -name '*.h' \
-                -o -name '*.hh' \
-                -o -name '*.hpp'); do
-    "${ASTYLE_CMD}" --options="$ASTYLE_RC" "${f}"
-  done
-  
-  # Remove backup files.
-  find . -name "*.orig" | xargs --no-run-if-empty rm -v
-  
-  popd
-done
diff --git a/rssguard.pro b/rssguard.pro
index 75a3862e9..63986c83d 100755
--- a/rssguard.pro
+++ b/rssguard.pro
@@ -185,7 +185,7 @@ win32 {
   }
 }
 
-DISTFILES += .astylerc
+DISTFILES += resources/scripts/astyle/.astylerc
 
 MOC_DIR = $$OUT_PWD/moc
 RCC_DIR = $$OUT_PWD/rcc
diff --git a/src/dynamic-shortcuts/dynamicshortcutswidget.cpp b/src/dynamic-shortcuts/dynamicshortcutswidget.cpp
index 289d03b60..aefd7731d 100755
--- a/src/dynamic-shortcuts/dynamicshortcutswidget.cpp
+++ b/src/dynamic-shortcuts/dynamicshortcutswidget.cpp
@@ -29,7 +29,7 @@
 DynamicShortcutsWidget::DynamicShortcutsWidget(QWidget* parent) : QWidget(parent) {
 	// Create layout for this control and set is as active.
 	m_layout = new QGridLayout(this);
-	m_layout->setMargin(0);
+  m_layout->setMargin(0);
 	setLayout(m_layout);
 }