diff --git a/.codecov.yml b/.codecov.yml
index db76994483b..705e496a423 100644
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -1,7 +1,26 @@
 comment: false
 ignore:
-  - "/usr/local*/**/*"
-  - "/usr/include/**/*"
-  - "lib/"
+  - "**/usr/local*/**/*"
+  - "**/usr/include/**/*"
+  - "**/lib/certify/*"
+  - "**/lib/expected-lite/*"
+  - "**/lib/googletest/*"
+  - "**/lib/libcommuni/*"
+  - "**/lib/lrucache/*"
+  - "**/lib/lua/*"
+  - "**/lib/magic_enum/*"
+  - "**/lib/miniaudio/*"
+  - "**/lib/qtkeychain/*"
+  - "**/lib/rapidjson/*"
+  - "**/lib/semver/*"
+  - "**/lib/serialize/*"
+  - "**/lib/settings/*"
+  - "**/lib/signals/*"
+  - "**/lib/sol2/*"
+  - "**/lib/websocketpp/*"
+  - "**/lib/WinToast/*"
+  - "**/build*/"
   - "**/ui_*.h"
   - "**/moc_*.cpp"
+fixes:
+  - "__w/chatterino2/chatterino2/::"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 05a83ebd8ca..4c09fa60353 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -781,14 +781,37 @@ endif()
 
 if (CHATTERINO_GENERATE_COVERAGE)
     include(CodeCoverage)
-    append_coverage_compiler_flags_to_target(${LIBRARY_PROJECT})
+    if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
+        target_compile_options(${LIBRARY_PROJECT} PRIVATE -coverage)
+        target_link_options(${LIBRARY_PROJECT} PRIVATE -coverage)
+    else()
+        append_coverage_compiler_flags_to_target(${LIBRARY_PROJECT})
+    endif()
     message(STATUS "project source dir: ${PROJECT_SOURCE_DIR}/src")
     setup_target_for_coverage_gcovr_html(
         NAME coverage
         EXECUTABLE ctest
         EXCLUDE "/usr/include/*"
-        EXCLUDE "build-*/*"
-        EXCLUDE "lib/*"
+        EXCLUDE "build*/*"
+        # EXCLUDE "lib/*"
+        EXCLUDE "lib/certify/*"
+        EXCLUDE "lib/expected-lite/*"
+        EXCLUDE "lib/googletest/*"
+        EXCLUDE "lib/libcommuni/*"
+        EXCLUDE "lib/lrucache/*"
+        EXCLUDE "lib/lua/*"
+        EXCLUDE "lib/magic_enum/*"
+        EXCLUDE "lib/miniaudio/*"
+        EXCLUDE "lib/qtkeychain/*"
+        EXCLUDE "lib/rapidjson/*"
+        EXCLUDE "lib/semver/*"
+        EXCLUDE "lib/serialize/*"
+        EXCLUDE "lib/settings/*"
+        EXCLUDE "lib/signals/*"
+        EXCLUDE "lib/sol2/*"
+        EXCLUDE "lib/websocketpp/*"
+        EXCLUDE "lib/WinToast/*"
+
         EXCLUDE "*/ui_*.h"
         EXCLUDE "*/moc_*.cpp"
         )