diff --git a/.travis.yml b/.travis.yml
index d925a7d1..ffc82945 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 sudo: required
-dist: trusty
+dist: xenial
+services:
+  - xvfb
 
 language: cpp
 branches:
@@ -14,38 +16,41 @@ matrix:
     - os: osx
       env: CONFIGS="Debug_And_Release" GENERATORS="Xcode" COMPILERS="Clang"
     - os: linux
-      env: CONFIGS="Debug Release" GENERATORS="Makefiles Ninja" COMPILERS="GNU Clang"
+      env: CONFIGS="Debug Release" GENERATORS="Makefiles Ninja" COMPILERS="GNU Clang" PPA_INFIX="-5.12.3" QT_VERSION_MM="512"
       addons:
         apt:
           packages: clang
     - os: linux
-      env: CONFIGS="RelWithDebInfo" GENERATORS="Ninja" COMPILERS="Clang" MEMCHECK=true
+      env: CONFIGS="RelWithDebInfo" GENERATORS="Ninja" COMPILERS="Clang" MEMCHECK=true PPA_INFIX="-5.12.3" QT_VERSION_MM="512"
       addons:
         apt:
           packages: valgrind clang
     - os: linux
-      env: CONFIGS="Debug Release" GENERATORS="Ninja" COMPILERS="GNU" QT_VERSION_MM=54 QT_VERSION_FULL=542
+      env: CONFIGS="Debug Release" GENERATORS="Ninja" COMPILERS="GNU" PPA_INFIX="563" QT_VERSION_MM="56"
     - os: linux
-      env: CONFIGS="Debug Release" GENERATORS="Ninja" COMPILERS="GNU" QT_VERSION_MM=53 QT_VERSION_FULL=532 CMAKE_VERSION_MM=3.1 CMAKE_VERSION_FULL=3.1.3
+      env: CONFIGS="Debug Release" GENERATORS="Ninja" COMPILERS="GNU" PPA_INFIX="571" QT_VERSION_MM="57"
     - os: linux
-      env: CONFIGS="Coverage" GENERATORS="Makefiles" COMPILERS="GNU"
+      env: CONFIGS="Debug Release" GENERATORS="Ninja" COMPILERS="GNU" PPA_INFIX="58" QT_VERSION_MM="58"
+    - os: linux
+      env: CONFIGS="Debug Release" GENERATORS="Ninja" COMPILERS="GNU" PPA_INFIX="596" QT_VERSION_MM="59"
+    - os: linux
+      env: CONFIGS="Debug Release" GENERATORS="Ninja" COMPILERS="GNU" PPA_INFIX="-5.10.1" QT_VERSION_MM="510"
+    - os: linux
+      env: CONFIGS="Debug Release" GENERATORS="Ninja" COMPILERS="GNU" PPA_INFIX="-5.11.3" QT_VERSION_MM="511"
+    - os: linux
+      env: CONFIGS="Debug Release" GENERATORS="Ninja" COMPILERS="GNU" PPA_INFIX="-5.12.3" QT_VERSION_MM="512"
+    - os: linux
+      env: CONFIGS="Coverage" GENERATORS="Makefiles" COMPILERS="GNU" PPA_INFIX="-5.12.3" QT_VERSION_MM="512"
+
 
 before_install:
-  - if [ -z "$CMAKE_VERSION_MM" ]; then export CMAKE_VERSION_MM=3.4; fi
-  - if [ -z "$CMAKE_VERSION_FULL" ]; then export CMAKE_VERSION_FULL=3.4.0; fi
-  - if [ -z "$QT_VERSION_FULL" ]; then export QT_VERSION_FULL=551; fi
-  - if [ -z "$QT_VERSION_MM" ]; then export QT_VERSION_MM=55; fi
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then
-    sudo apt-add-repository --yes ppa:beineri/opt-qt${QT_VERSION_FULL}-trusty
+      export CMAKE_PREFIX_PATH=/opt/qt${QT_VERSION_MM} 
+      && sudo apt-add-repository --yes ppa:beineri/opt-qt${PPA_INFIX}-xenial
       && sudo apt-get update -qq
-      && sudo apt-get install -qq qt${QT_VERSION_MM}base qt${QT_VERSION_MM}script qt${QT_VERSION_MM}tools
-      && sudo apt-get install -qq ninja-build clang lcov
-      && export CMAKE_PREFIX_PATH=/opt/qt${QT_VERSION_MM}
-      && wget --no-check-certificate http://www.cmake.org/files/v${CMAKE_VERSION_MM}/cmake-${CMAKE_VERSION_FULL}-Linux-x86_64.sh
-      && sudo sh cmake-${CMAKE_VERSION_FULL}-Linux-x86_64.sh --prefix=/usr/local --exclude-subdir
-      && export DISPLAY=:99.0
-      && sh -e /etc/init.d/xvfb start;
-    fi
+      && sudo apt-get install -qq qtbase5-dev qtdeclarative5-dev qttools5-dev qt${QT_VERSION_MM}base qt${QT_VERSION_MM}script qt${QT_VERSION_MM}tools ninja-build clang lcov cmake
+      ;
+      fi
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then
       brew update;
       brew outdated cmake || brew upgrade cmake;
diff --git a/appveyor.yml b/appveyor.yml
index 94e44c27..2c67fd88 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,67 +7,81 @@ branches:
 shallow_clone: true
 clone_depth: 1
 
-init:
-  - git config --global core.autocrlf input
-
 clone_folder: c:\dev\grantlee
 
 environment:
   matrix:
-  - CMAKE_GENERATOR: "Ninja"
-    QT5: C:\Qt\5.5\msvc2013
+  - CMAKE_GENERATOR: "NMake Makefiles JOM"
+    QT5: C:\Qt\5.6\msvc2015
     PLATFORM: X86
-    VSVER: 12
-  - CMAKE_GENERATOR: "Ninja"
-    QT5: C:\Qt\5.5\msvc2013_64
-    PLATFORM: X64
-    VSVER: 12
+    VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat"
   - CMAKE_GENERATOR: "Ninja"
     QT5: C:\Qt\5.6\msvc2015
     PLATFORM: X86
-    VSVER: 14
+    VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat"
   - CMAKE_GENERATOR: "Ninja"
     QT5: C:\Qt\5.6\msvc2015_64
     PLATFORM: X64
-    VSVER: 14
-  - CMAKE_GENERATOR: "Visual Studio 12"
-    QT5: C:\Qt\5.5\msvc2013
-    PLATFORM: X86
-    VSVER: 12
-  - CMAKE_GENERATOR: "Visual Studio 12 Win64"
-    QT5: C:\Qt\5.5\msvc2013_64
-    PLATFORM: X64
-    VSVER: 12
+    VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat"
   - CMAKE_GENERATOR: "Visual Studio 14"
     QT5: C:\Qt\5.6\msvc2015
     PLATFORM: X86
-    VSVER: 14
+    VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat"
   - CMAKE_GENERATOR: "Visual Studio 14 Win64"
     QT5: C:\Qt\5.6\msvc2015_64
     PLATFORM: X64
-    VSVER: 14
+    VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat"
   - CMAKE_GENERATOR: "NMake Makefiles JOM"
-    QT5: C:\Qt\5.5\msvc2013
+    QT5: C:\Qt\5.6\msvc2015_64
+    PLATFORM: X64
+    VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat"
+  - CMAKE_GENERATOR: "MinGW Makefiles"
+    QT5: C:\Qt\5.6\mingw49_32
+    MINGW_PATH: C:\Qt\Tools\mingw492_32
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    CMAKE_GENERATOR: "Ninja"
+    QT5: C:\Qt\5.12.2\msvc2017
     PLATFORM: X86
-    VSVER: 12
-  - CMAKE_GENERATOR: "NMake Makefiles JOM"
-    QT5: C:\Qt\5.5\msvc2013_64
+    VCVARSALL: "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvarsall.bat"
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    CMAKE_GENERATOR: "Ninja"
+    QT5: C:\Qt\5.12.2\msvc2017_64
     PLATFORM: X64
-    VSVER: 12
-  - CMAKE_GENERATOR: "NMake Makefiles JOM"
-    QT5: C:\Qt\5.6\msvc2015
+    VCVARSALL: "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvarsall.bat"
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    CMAKE_GENERATOR: "Visual Studio 15"
+    QT5: C:\Qt\5.12.2\msvc2017
     PLATFORM: X86
-    VSVER: 14
-  - CMAKE_GENERATOR: "NMake Makefiles JOM"
-    QT5: C:\Qt\5.6\msvc2015_64
+    VCVARSALL: "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvarsall.bat"
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    CMAKE_GENERATOR: "Visual Studio 15 Win64"
+    QT5: C:\Qt\5.12.2\msvc2017_64
+    PLATFORM: X64
+    VCVARSALL: "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvarsall.bat"
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    CMAKE_GENERATOR: "NMake Makefiles JOM"
+    QT5: C:\Qt\5.12.2\msvc2017
+    PLATFORM: X86
+    VCVARSALL: "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvarsall.bat"
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    CMAKE_GENERATOR: "NMake Makefiles JOM"
+    QT5: C:\Qt\5.12.2\msvc2017_64
     PLATFORM: X64
-    VSVER: 14
+    VCVARSALL: "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvarsall.bat"
   - CMAKE_GENERATOR: "MinGW Makefiles"
-    QT5: C:\Qt\5.5\mingw492_32
-    MINGW_PATH: C:\Qt\Tools\mingw492_32
+    QT5: C:\Qt\5.12.2\mingw73_32
+    MINGW_PATH: C:\Qt\Tools\mingw730_32
   - CMAKE_GENERATOR: "MinGW Makefiles"
-    QT5: C:\Qt\5.6\mingw49_32
-    MINGW_PATH: C:\Qt\Tools\mingw492_32
+    QT5: C:\Qt\5.12.2\mingw73_64
+    MINGW_PATH: C:\Qt\Tools\mingw730_64
+
+install:
+  - ps: |
+      choco install ninja
+
+init:
+  - if NOT "%VCVARSALL%" == "" call "%VCVARSALL%" %PLATFORM%
+  - git config --global core.autocrlf input
 
 before_build:
   - set PATH=C:\cygwin\bin;%QT5%\bin;c:\dev\grantlee\build\templates\lib;c:\dev\grantlee\build\textdocument\lib;%PATH%
@@ -75,22 +89,10 @@ before_build:
   - set PATH=%PATH:C:\cygwin\bin;=%
   - if "%CMAKE_GENERATOR%" == "MinGW Makefiles" set PATH=%MINGW_PATH%\bin;%PATH:C:\Program Files\Git\usr\bin;=%
   - if "%CMAKE_GENERATOR%" == "NMake Makefiles JOM" set PATH=C:\Qt\Tools\QtCreator\bin;%PATH%
-  - if "%CMAKE_GENERATOR%" == "Ninja" cinst ninja
-  - if "%CMAKE_GENERATOR%" == "Ninja" set PATH=C:\tools\ninja;%PATH%
-  #- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 
 build:
 
 build_script:
-  - ps: $env:VSCOMNTOOLS=(Get-Content ("env:VS" + "$env:VSVER" + "0COMNTOOLS"))
-  - if NOT "%CMAKE_GENERATOR%" == "MinGW Makefiles" echo "Using Visual Studio %VSVER%.0 at %VSCOMNTOOLS%"
-  - if "%CMAKE_GENERATOR%" == "MinGW Makefiles" echo "Using MinGW"
-  - if "%CMAKE_GENERATOR%" == "NMake Makefiles JOM" if "%PLATFORM%" == "X86" call "%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat"
-  - if "%CMAKE_GENERATOR%" == "NMake Makefiles JOM" if "%PLATFORM%" == "X64" "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
-  - if "%CMAKE_GENERATOR%" == "NMake Makefiles JOM" if "%PLATFORM%" == "X64" call "%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
-  - if "%CMAKE_GENERATOR%" == "Ninja" if "%PLATFORM%" == "X86" call "%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat"
-  - if "%CMAKE_GENERATOR%" == "Ninja" if "%PLATFORM%" == "X64" "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
-  - if "%CMAKE_GENERATOR%" == "Ninja" if "%PLATFORM%" == "X64" call "%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
   - cd c:\dev\grantlee
   - md build
   - cd build