diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a941e0..687b25f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,7 +32,8 @@ generate_emoji(lib_ui emoji_suggestions/emoji_autocomplete.json)
 
 set_target_properties(lib_ui PROPERTIES AUTOMOC ON AUTORCC ON)
 
-set(lib_ui_sources
+target_precompile_headers(lib_ui PRIVATE ${src_loc}/ui/ui_pch.h)
+nice_target_sources(lib_ui ${src_loc}
 PRIVATE
     ${qrc_files}
     ${style_files}
@@ -186,9 +187,6 @@ PRIVATE
     emoji_suggestions/emoji_suggestions.h
     emoji_suggestions/emoji_suggestions_helper.h
 )
-nice_target_sources(lib_ui ${src_loc} "${lib_ui_sources}")
-
-target_precompile_headers(lib_ui PRIVATE ${src_loc}/ui/ui_pch.h)
 
 target_include_directories(lib_ui
 PUBLIC
diff --git a/cmake/generate_emoji.cmake b/cmake/generate_emoji.cmake
index 0c35ec0..a85dac8 100644
--- a/cmake/generate_emoji.cmake
+++ b/cmake/generate_emoji.cmake
@@ -2,22 +2,20 @@ function(generate_emoji target_name suggestions_json)
     set(gen_dst ${CMAKE_CURRENT_BINARY_DIR}/gen)
     file(MAKE_DIRECTORY ${gen_dst})
 
-    set(gen_src ${CMAKE_CURRENT_SOURCE_DIR}/${suggestions_json})
-    set(generated_files
+    set(gen_timestamp ${gen_dst}/emoji.timestamp)
+    set(gen_files
         ${gen_dst}/emoji.cpp
         ${gen_dst}/emoji.h
         ${gen_dst}/emoji_suggestions_data.cpp
         ${gen_dst}/emoji_suggestions_data.h
-        ${gen_dst}/emoji.timestamp
     )
+
+    set(gen_src ${CMAKE_CURRENT_SOURCE_DIR}/${suggestions_json})
     add_custom_command(
     OUTPUT
-        ${gen_dst}/emoji.timestamp
+        ${gen_timestamp}
     BYPRODUCTS
-        ${gen_dst}/emoji.cpp
-        ${gen_dst}/emoji.h
-        ${gen_dst}/emoji_suggestions_data.cpp
-        ${gen_dst}/emoji_suggestions_data.h
+        ${gen_files}
     COMMAND
         codegen_emoji
         -o${gen_dst}
@@ -27,5 +25,5 @@ function(generate_emoji target_name suggestions_json)
         codegen_emoji
         ${gen_src}
     )
-    generate_target(${target_name} emoji "${generated_files}" ${gen_dst})
+    generate_target(${target_name} emoji ${gen_timestamp} "${gen_files}" ${gen_dst})
 endfunction()
diff --git a/cmake/generate_palette.cmake b/cmake/generate_palette.cmake
index 82e93d0..e3f7043 100644
--- a/cmake/generate_palette.cmake
+++ b/cmake/generate_palette.cmake
@@ -2,18 +2,18 @@ function(generate_palette target_name palette_file)
     set(gen_dst ${CMAKE_CURRENT_BINARY_DIR}/gen)
     file(MAKE_DIRECTORY ${gen_dst})
 
-    set(gen_src ${CMAKE_CURRENT_SOURCE_DIR}/${palette_file})
-    set(generated_files
-        ${gen_dst}/styles/palette.cpp
-        ${gen_dst}/styles/palette.h
-        ${gen_dst}/styles/palette.timestamp
+    set(gen_timestamp ${gen_dst}/styles/palette.timestamp)
+    set(gen_files
+         ${gen_dst}/styles/palette.cpp
+         ${gen_dst}/styles/palette.h
     )
+
+    set(gen_src ${CMAKE_CURRENT_SOURCE_DIR}/${palette_file})
     add_custom_command(
     OUTPUT
-        ${gen_dst}/styles/palette.timestamp
+       ${gen_timestamp}
     BYPRODUCTS
-        ${gen_dst}/styles/palette.cpp
-        ${gen_dst}/styles/palette.h
+        ${gen_files}
     COMMAND
         codegen_style
         -I${gen_dst}
@@ -28,5 +28,5 @@ function(generate_palette target_name palette_file)
     MAIN_DEPENDENCY
         ${gen_src}
     )
-    generate_target(${target_name} palette "${generated_files}" ${gen_dst})
+    generate_target(${target_name} palette ${gen_timestamp} "${gen_files}" ${gen_dst})
 endfunction()
diff --git a/cmake/generate_styles.cmake b/cmake/generate_styles.cmake
index 4a17c9d..84617ea 100644
--- a/cmake/generate_styles.cmake
+++ b/cmake/generate_styles.cmake
@@ -2,13 +2,14 @@ function(generate_styles target_name src_loc style_files dependent_style_files)
     set(gen_dst ${CMAKE_CURRENT_BINARY_DIR}/gen)
     file(MAKE_DIRECTORY ${gen_dst})
 
-    set(full_generated_files "")
+    set(gen_timestamp ${gen_dst}/styles/${target_name}_style.timestamp)
+    set(gen_files "")
     set(full_generation_sources "")
     set(full_dependencies_list ${dependent_style_files})
     foreach (file ${style_files})
         list(APPEND full_generation_sources ${src_loc}/${file})
         get_filename_component(file_name ${file} NAME_WLE)
-        list(APPEND full_generated_files
+        list(APPEND gen_files
             ${gen_dst}/styles/style_${file_name}.cpp
             ${gen_dst}/styles/style_${file_name}.h
         )
@@ -17,9 +18,9 @@ function(generate_styles target_name src_loc style_files dependent_style_files)
 
     add_custom_command(
     OUTPUT
-        ${gen_dst}/styles/${target_name}_style.timestamp
+        ${gen_timestamp}
     BYPRODUCTS
-        ${full_generated_files}
+        ${gen_files}
     COMMAND
         codegen_style
         -I${src_loc}
@@ -35,6 +36,5 @@ function(generate_styles target_name src_loc style_files dependent_style_files)
         ${full_dependencies_list}
     )
 
-    list(APPEND full_generated_files ${gen_dst}/styles/${target_name}_style.timestamp)
-    generate_target(${target_name} styles "${full_generated_files}" ${gen_dst})
+    generate_target(${target_name} styles ${gen_timestamp} "${gen_files}" ${gen_dst})
 endfunction()