diff --git a/src/common/bar.c b/src/common/bar.c
index a8f7c7b62..34b14aa7a 100644
--- a/src/common/bar.c
+++ b/src/common/bar.c
@@ -1,3 +1,4 @@
+#include "util/textModifier.h"
 #include "bar.h"
 
 // green, yellow, red: print the color on nth (0~9) block
diff --git a/src/common/format.c b/src/common/format.c
index 70f24e38e..b491713cf 100644
--- a/src/common/format.c
+++ b/src/common/format.c
@@ -1,6 +1,7 @@
 #include "fastfetch.h"
 #include "common/format.h"
 #include "common/parsing.h"
+#include "util/textModifier.h"
 
 #include <inttypes.h>
 
diff --git a/src/common/init.c b/src/common/init.c
index fb3bba75a..1483a6499 100644
--- a/src/common/init.c
+++ b/src/common/init.c
@@ -5,6 +5,7 @@
 #include "detection/qt.h"
 #include "detection/gtk.h"
 #include "detection/displayserver/displayserver.h"
+#include "util/textModifier.h"
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/src/common/printing.c b/src/common/printing.c
index 38d5f9619..4b593001a 100644
--- a/src/common/printing.c
+++ b/src/common/printing.c
@@ -1,5 +1,6 @@
 #include "fastfetch.h"
 #include "common/printing.h"
+#include "util/textModifier.h"
 
 void ffPrintLogoAndKey(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat)
 {
diff --git a/src/fastfetch.h b/src/fastfetch.h
index 16a80d6b9..96dd4a445 100644
--- a/src/fastfetch.h
+++ b/src/fastfetch.h
@@ -26,10 +26,6 @@
 static inline void ffUnused(int dummy, ...) { (void) dummy; }
 #define FF_UNUSED(...) ffUnused(0, __VA_ARGS__);
 
-#define FASTFETCH_TEXT_MODIFIER_BOLT  "\033[1m"
-#define FASTFETCH_TEXT_MODIFIER_ERROR "\033[1;31m"
-#define FASTFETCH_TEXT_MODIFIER_RESET "\033[0m"
-
 #define FASTFETCH_LOGO_MAX_COLORS 9 //two digits would make parsing much more complicated (index 1 - 9)
 
 typedef enum FFLogoType
diff --git a/src/logo/logo.c b/src/logo/logo.c
index 93667ddd3..6abb1b083 100644
--- a/src/logo/logo.c
+++ b/src/logo/logo.c
@@ -3,6 +3,7 @@
 #include "common/printing.h"
 #include "detection/os/os.h"
 #include "detection/terminalshell/terminalshell.h"
+#include "util/textModifier.h"
 
 #include <ctype.h>
 #include <string.h>
diff --git a/src/modules/colors.c b/src/modules/colors.c
index 626ced7b0..40a936e00 100644
--- a/src/modules/colors.c
+++ b/src/modules/colors.c
@@ -1,5 +1,6 @@
 #include "fastfetch.h"
 #include "common/printing.h"
+#include "util/textModifier.h"
 
 void ffPrintColors(FFinstance* instance)
 {
diff --git a/src/modules/custom.c b/src/modules/custom.c
index 723f7059c..f91a5b69e 100644
--- a/src/modules/custom.c
+++ b/src/modules/custom.c
@@ -1,5 +1,6 @@
 #include "fastfetch.h"
 #include "common/printing.h"
+#include "util/textModifier.h"
 
 void ffPrintCustom(FFinstance* instance, const char* key, const char* value)
 {
diff --git a/src/modules/title.c b/src/modules/title.c
index 089b5105c..cef00d146 100644
--- a/src/modules/title.c
+++ b/src/modules/title.c
@@ -1,6 +1,7 @@
 #include "fastfetch.h"
 #include "common/printing.h"
 #include "detection/title.h"
+#include "util/textModifier.h"
 
 static inline void printTitlePart(FFinstance* instance, const FFstrbuf* content)
 {
diff --git a/src/util/textModifier.h b/src/util/textModifier.h
new file mode 100644
index 000000000..f282d31d5
--- /dev/null
+++ b/src/util/textModifier.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#ifndef FASTFETCH_INCLUDED_TEXT_MODIFIER
+#define FASTFETCH_INCLUDED_TEXT_MODIFIER
+
+#define FASTFETCH_TEXT_MODIFIER_BOLT  "\033[1m"
+#define FASTFETCH_TEXT_MODIFIER_ERROR "\033[1;31m"
+#define FASTFETCH_TEXT_MODIFIER_RESET "\033[0m"
+
+#endif
diff --git a/tests/list.c b/tests/list.c
index 38be491e5..e9c10423e 100644
--- a/tests/list.c
+++ b/tests/list.c
@@ -1,8 +1,10 @@
-#include "fastfetch.h"
+#include "util/FFlist.h"
+#include "util/textModifier.h"
 
 #include <string.h>
 #include <stdarg.h>
 #include <stdlib.h>
+#include <stdio.h>
 
 __attribute__((__noreturn__))
 static void testFailed(const FFlist* list, const char* expression, int lineNo)
@@ -26,10 +28,8 @@ static bool numEqualsAdapter(const void* first, const void* second)
 
 #define VERIFY(expression) if(!(expression)) testFailed(&list, #expression, __LINE__)
 
-int main(int argc, char** argv)
+int main(void)
 {
-    FF_UNUSED(argc, argv)
-
     FFlist list;
 
     //initA
diff --git a/tests/strbuf.c b/tests/strbuf.c
index c02d31510..dd8b6d57d 100644
--- a/tests/strbuf.c
+++ b/tests/strbuf.c
@@ -1,7 +1,9 @@
-#include "fastfetch.h"
+#include "util/FFstrbuf.h"
+#include "util/textModifier.h"
 
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
 
 __attribute__((__noreturn__))
 static void testFailed(const FFstrbuf* strbuf, const char* expression, int lineNo)
@@ -17,14 +19,12 @@ static void testFailed(const FFstrbuf* strbuf, const char* expression, int lineN
 #define VERIFY(expression) if(!(expression)) testFailed(&strbuf, #expression, __LINE__)
 
 int shouldNotBeCalled(int c) {
-    FF_UNUSED(c);
+    (void)c;
     exit(1);
 }
 
-int main(int argc, char** argv)
+int main(void)
 {
-    FF_UNUSED(argc, argv)
-
     FFstrbuf strbuf;
 
     //destroy 0