diff --git a/ScreenPlay/CMakeLists.txt b/ScreenPlay/CMakeLists.txt
index 289b4d84..c72ca814 100644
--- a/ScreenPlay/CMakeLists.txt
+++ b/ScreenPlay/CMakeLists.txt
@@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.17 )
 
 project(ScreenPlay  LANGUAGES CXX)
 
+set(CMAKE_CXX_STANDARD 20)
+
+
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOMOC ON)
 
@@ -70,10 +73,8 @@ set(l10n
 set_source_files_properties(${l10n} PROPERTIES OUTPUT_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/translations")
 qt5_add_translation(qmFiles ${l10n})
 
-# For development purposes to display source files in QtCreator
-#qt5_add_resources(qml qml.qrc resources.qrc)
 
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
     qt5_add_resources(qml qml.qrc resources.qrc)
 else()
     qtquick_compiler_add_resources(qml qml.qrc resources.qrc)
diff --git a/ScreenPlayWallpaper/CMakeLists.txt b/ScreenPlayWallpaper/CMakeLists.txt
index f7ca0826..39f404c8 100644
--- a/ScreenPlayWallpaper/CMakeLists.txt
+++ b/ScreenPlayWallpaper/CMakeLists.txt
@@ -45,10 +45,8 @@ set( src
 set( headers
         src/basewindow.h)
 
-# For development purposes to display source files in QtCreator
-#qt5_add_resources(resources SPWResources.qrc)
 
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
     set(resources SPWResources.qrc)
 else()
     qtquick_compiler_add_resources(resources SPWResources.qrc )
diff --git a/ScreenPlayWidget/CMakeLists.txt b/ScreenPlayWidget/CMakeLists.txt
index 944d2517..c78268b2 100644
--- a/ScreenPlayWidget/CMakeLists.txt
+++ b/ScreenPlayWidget/CMakeLists.txt
@@ -20,7 +20,7 @@ set(src main.cpp
 set(headers
     src/widgetwindow.h)
 
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
     set(resources SPWidgetResources.qrc)
 else()
     qtquick_compiler_add_resources(resources SPWidgetResources.qrc )