diff --git a/README.md b/README.md
index eb2830f..408747a 100644
--- a/README.md
+++ b/README.md
@@ -125,7 +125,6 @@ include(GenerateExportHeader)
 include(WriteCompilerDetectionHeader)
 ```
 
-
 ### Project Meta Information
 
 The declaration of project-wide information--that are used, e.g., within documentation, testing, and deployment--, is combined within the project meta information section in the main `CMakeLists.txt`.
diff --git a/appveyor.yml b/appveyor.yml
index 7218492..84114ff 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,9 +4,9 @@ branches:
   - master
 clone_folder: c:\projects\cmake-init
 image:
-- Visual Studio 2013
 - Visual Studio 2015
 - Visual Studio 2017
+- Visual Studio 2019
 configuration:
 - Release
 - Debug
@@ -22,12 +22,12 @@ matrix:
 # skip unsupported combinations
 init:
 - set arch=
-- if "%arch%"=="Win64" ( set arch= Win64)
+- if "%arch%"=="Win64" ( set arch= x64)
 - echo %arch%
 - echo %APPVEYOR_BUILD_WORKER_IMAGE%
-- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" ( set generator="Visual Studio 15 2017%arch%" )
-- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" ( set generator="Visual Studio 14 2015%arch%" )
-- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2013" ( set generator="Visual Studio 12 2013%arch%" )
+- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" ( set generator="Visual Studio 15 2017" )
+- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" ( set generator="Visual Studio 14 2015" )
+- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" ( set generator="Visual Studio 16 2019" )
 - echo %generator%
 
 before_build:
@@ -35,7 +35,7 @@ before_build:
     mkdir build
     cd build
     cmake --version
-    cmake .. -G %generator%
+    cmake .. -G %generator%  -A %arch%
 
 build:
   project: c:\projects\cmake-init\build\template.sln
diff --git a/source/baselib/CMakeLists.txt b/source/baselib/CMakeLists.txt
index 754a9d8..50d91f9 100644
--- a/source/baselib/CMakeLists.txt
+++ b/source/baselib/CMakeLists.txt
@@ -169,7 +169,7 @@ target_compile_options(${target}
 # Linker options
 # 
 
-target_link_libraries(${target}
+target_link_options(${target}
     PRIVATE
 
     PUBLIC
diff --git a/source/examples/fibcmd/CMakeLists.txt b/source/examples/fibcmd/CMakeLists.txt
index 9cd69ba..3e83d28 100644
--- a/source/examples/fibcmd/CMakeLists.txt
+++ b/source/examples/fibcmd/CMakeLists.txt
@@ -99,7 +99,7 @@ target_compile_options(${target}
 # Linker options
 # 
 
-target_link_libraries(${target}
+target_link_options(${target}
     PRIVATE
     ${DEFAULT_LINKER_OPTIONS}
 )
diff --git a/source/examples/fibgui/CMakeLists.txt b/source/examples/fibgui/CMakeLists.txt
index 60f7310..f794935 100644
--- a/source/examples/fibgui/CMakeLists.txt
+++ b/source/examples/fibgui/CMakeLists.txt
@@ -122,7 +122,7 @@ target_compile_options(${target}
 # Linker options
 # 
 
-target_link_libraries(${target}
+target_link_options(${target}
     PRIVATE
     ${DEFAULT_LINKER_OPTIONS}
 )
diff --git a/source/fiblib/CMakeLists.txt b/source/fiblib/CMakeLists.txt
index f97461b..5eeb77e 100644
--- a/source/fiblib/CMakeLists.txt
+++ b/source/fiblib/CMakeLists.txt
@@ -171,7 +171,7 @@ target_compile_options(${target}
 # Linker options
 # 
 
-target_link_libraries(${target}
+target_link_options(${target}
     PRIVATE
 
     PUBLIC
diff --git a/source/tests/fiblib-test/CMakeLists.txt b/source/tests/fiblib-test/CMakeLists.txt
index ebd471d..1b70c9c 100644
--- a/source/tests/fiblib-test/CMakeLists.txt
+++ b/source/tests/fiblib-test/CMakeLists.txt
@@ -95,7 +95,7 @@ target_compile_options(${target}
 # Linker options
 # 
 
-target_link_libraries(${target}
+target_link_options(${target}
     PRIVATE
     ${DEFAULT_LINKER_OPTIONS}
 )