diff --git a/.github/workflows/building.yml b/.github/workflows/building.yml
index bf34655..f366df4 100644
--- a/.github/workflows/building.yml
+++ b/.github/workflows/building.yml
@@ -13,7 +13,26 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        include:
+          - name: Linux GCC
+            os: ubuntu-latest
+            compiler: g++
+
+          - name: Linux Clang
+            os: ubuntu-latest
+            compiler: clang++
+
+          - name: MacOS Clang
+            os: macos-latest
+            compiler: clang++
+
+          - name: Windows GCC
+            os: windows-latest
+            compiler: g++
+
+          - name: Windows MSVC
+            os: windows-latest
+            compiler: cl
 
     steps:
       - name: Checkout
@@ -26,7 +45,7 @@ jobs:
           ninjaVersion: "^1.0"     # use most recent 1.x version
 
       - name: CMake Setup
-        run: cmake -S . -B ${{github.workspace}}/build -G Ninja -D CMAKE_C_COMPILER=gcc -D CMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+        run: cmake -S . -B ${{github.workspace}}/build -G Ninja -D CMAKE_CXX_COMPILER=${{matrix.compiler}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
 
       - name: CMake Build
         run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target caravan
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b418b27..421197e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,9 +35,10 @@ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
 FetchContent_MakeAvailable(googletest)
 # ---
 
-include_directories(include)
 
 # --- caravan libraries
+include_directories(include)
+
 add_library(controller
         "include/caravan/controller/controller.h"
 
@@ -93,7 +94,6 @@ target_link_libraries(caravan
         PRIVATE model
         PRIVATE user
         PRIVATE view
-        PRIVATE ftxui::screen
         PRIVATE ftxui::dom
         PRIVATE ftxui::component
 )