diff --git a/CMakeLists.txt b/CMakeLists.txt
index a2a2be86d..a1e3946fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 3.1.0) # Threads::Threads
 
 project(fastfetch LANGUAGES C)
 
-option(BUILD_TESTS "Build test programs" OFF)
-
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Release)
 endif()
@@ -11,10 +9,6 @@ endif()
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wconversion")
 set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-Wl,-O3")
 
-if(BUILD_TESTS)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=native -mtune=native -pipe -fno-plt")
-endif(BUILD_TESTS)
-
 execute_process(
     COMMAND git rev-list --count HEAD
     WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
@@ -221,9 +215,12 @@ target_compile_definitions(flashfetch PUBLIC
     FASTFETCH_BUILD_FLASHFETCH
 )
 
-if(BUILD_TESTS)
-    add_executable(fastfetch-test-performance
-        tests/performance.c
-        ${SRCS}
-    )
-endif(BUILD_TESTS)
+add_executable(fastfetch-test-performance
+    tests/performance.c
+    ${SRCS}
+)
+
+add_executable(fastfetch-test-strbuf
+    tests/strbuf.c
+    ${SRCS}
+)
diff --git a/run.sh b/run.sh
index baf04dc7f..77dc1d661 100755
--- a/run.sh
+++ b/run.sh
@@ -2,5 +2,5 @@
 mkdir -p build/
 cd build/
 cmake ..
-cmake --build . -j$(nproc)
+cmake --build . --target fastfetch -j$(nproc)
 ./fastfetch "$@"
diff --git a/src/common/init.c b/src/common/init.c
index 66bc16625..f79f0de5d 100644
--- a/src/common/init.c
+++ b/src/common/init.c
@@ -103,8 +103,11 @@ static void initState(FFstate* state)
 static void defaultConfig(FFinstance* instance)
 {
     ffStrbufInit(&instance->config.color);
+
+    ffStrbufInit(&instance->config.separator);
+    ffStrbufAppendS(&instance->config.separator, ": ");
+
     instance->config.logoKeySpacing = 4;
-    ffStrbufInitS(&instance->config.separator, ": ");
     instance->config.offsetx = 0;
     instance->config.colorLogo = true;
     instance->config.showErrors = false;
diff --git a/src/modules/localip.c b/src/modules/localip.c
index 26b6828ea..e32e61d09 100644
--- a/src/modules/localip.c
+++ b/src/modules/localip.c
@@ -14,7 +14,7 @@ static void printValue(FFinstance* instance, const char* ifaName, const char* ad
     FF_STRBUF_CREATE(key);
 
     if (instance->config.localIpKey.length == 0) {
-        ffStrbufSetF(&key, FF_LOCALIP_MODULE_NAME " (%s)", ifaName);
+        ffStrbufAppendF(&key, FF_LOCALIP_MODULE_NAME " (%s)", ifaName);
     } else {
         ffParseFormatString(&key, &instance->config.localIpKey, NULL, 1, (FFformatarg[]){
             {FF_FORMAT_ARG_TYPE_STRING, ifaName}
diff --git a/src/util/FFstrbuf.c b/src/util/FFstrbuf.c
index a0f03f335..0794bad66 100644
--- a/src/util/FFstrbuf.c
+++ b/src/util/FFstrbuf.c
@@ -3,6 +3,7 @@
 #include <malloc.h>
 #include <ctype.h>
 #include <string.h>
+#include <stdlib.h>
 
 static char* CHAR_NULL_PTR = "";
 
@@ -11,27 +12,6 @@ void ffStrbufInit(FFstrbuf* strbuf)
     ffStrbufInitA(strbuf, FASTFETCH_STRBUF_DEFAULT_ALLOC);
 }
 
-void ffStrbufInitCopy(FFstrbuf* strbuf, const FFstrbuf* src)
-{
-    ffStrbufInitA(strbuf, src->allocated);
-    ffStrbufAppend(strbuf, src);
-}
-
-void ffStrbufInitS(FFstrbuf* strbuf, const char* value)
-{
-    ffStrbufInitAS(strbuf, FASTFETCH_STRBUF_DEFAULT_ALLOC, value);
-}
-
-void ffStrbufInitNS(FFstrbuf* strbuf, uint32_t length, const char* value)
-{
-    ffStrbufInitANS(strbuf, FASTFETCH_STRBUF_DEFAULT_ALLOC, length, value);
-}
-
-void ffStrbufInitC(FFstrbuf* strbuf, char c)
-{
-    ffStrbufInitAC(strbuf, FASTFETCH_STRBUF_DEFAULT_ALLOC, c);
-}
-
 void ffStrbufInitA(FFstrbuf* strbuf, uint32_t allocate)
 {
     strbuf->allocated = allocate;
@@ -43,48 +23,21 @@ void ffStrbufInitA(FFstrbuf* strbuf, uint32_t allocate)
     ffStrbufClear(strbuf);
 }
 
-void ffStrbufInitAS(FFstrbuf* strbuf, uint32_t allocate, const char* value)
+void ffStrbufInitCopy(FFstrbuf* strbuf, const FFstrbuf* src)
 {
-    ffStrbufInitA(strbuf, allocate);
-    ffStrbufAppendS(strbuf, value);
-}
-
-void ffStrbufInitANS(FFstrbuf* strbuf, uint32_t allocate, uint32_t length, const char* value)
-{
-    ffStrbufInitA(strbuf, allocate);
-    ffStrbufAppendNS(strbuf, length, value);
-}
-
-void ffStrbufInitAC(FFstrbuf* strbuf, uint32_t allocate, char c)
-{
-    ffStrbufInitA(strbuf, allocate);
-    ffStrbufAppendC(strbuf, c);
-}
-
-void ffStrbufInitF(FFstrbuf* strbuf, const char* format, ...)
-{
-    ffStrbufInitA(strbuf, FASTFETCH_STRBUF_DEFAULT_ALLOC);
-    va_list arguments;
-    va_start(arguments, format);
-    ffStrbufAppendVF(strbuf, format, arguments);
-    va_end(arguments);
-}
-
-void ffStrbufInitVF(FFstrbuf* strbuf, const char* format, va_list arguments)
-{
-    ffStrbufInitA(strbuf, FASTFETCH_STRBUF_DEFAULT_ALLOC);
-    ffStrbufAppendVF(strbuf, format, arguments);
+    ffStrbufInitA(strbuf, src->allocated);
+    ffStrbufAppend(strbuf, src);
 }
 
 static void setCapacity(FFstrbuf* strbuf, uint32_t capacity)
 {
     if(strbuf->allocated == 0)
     {
-        strbuf->chars = malloc(sizeof(char) * capacity);
+        strbuf->chars = malloc(sizeof(*strbuf->chars) * capacity);
         strbuf->chars[0] = '\0';
     }
     else
-        strbuf->chars = realloc(strbuf->chars, sizeof(char) * capacity);
+        strbuf->chars = realloc(strbuf->chars, sizeof(*strbuf->chars) * capacity);
 
     strbuf->allocated = capacity;
 }
@@ -96,8 +49,8 @@ void ffStrbufEnsureCapacity(FFstrbuf* strbuf, uint32_t capacity)
 
     if(capacity == UINT32_MAX)
     {
-        capacity = UINT32_MAX - 1;
-        fprintf(stderr, "Warning: ffStrbufEnsureCapacity called with UINT32_MAX. Highest allowed value is UINT32_MAX - 1. Reducing capacity.\n");
+        fprintf(stderr, "Warning: ffStrbufEnsureCapacity called with UINT32_MAX. Highest allowed value is UINT32_MAX - 1. Exiting.\n");
+        exit(812);
     }
 
     setCapacity(strbuf, capacity + 1); // + 1 for the null byte
@@ -136,43 +89,9 @@ void ffStrbufClear(FFstrbuf* strbuf)
     strbuf->length = 0;
 }
 
-void ffStrbufSet(FFstrbuf* strbuf, const FFstrbuf* value)
+void ffStrbufRecalculateLength(FFstrbuf* strbuf)
 {
-    ffStrbufClear(strbuf);
-    ffStrbufAppendNS(strbuf, value->length, value->chars);
-}
-
-void ffStrbufSetS(FFstrbuf* strbuf, const char* value)
-{
-    ffStrbufClear(strbuf);
-    ffStrbufAppendS(strbuf, value);
-}
-
-void ffStrbufSetNS(FFstrbuf* strbuf, uint32_t length, const char* value)
-{
-    ffStrbufClear(strbuf);
-    ffStrbufAppendNS(strbuf, length, value);
-}
-
-void ffStrbufSetC(FFstrbuf* strbuf, char c)
-{
-    ffStrbufClear(strbuf);
-    ffStrbufAppendC(strbuf, c);
-}
-
-void ffStrbufSetF(FFstrbuf* strbuf, const char* format, ...)
-{
-    ffStrbufClear(strbuf);
-    va_list arguments;
-    va_start(arguments, format);
-    ffStrbufAppendVF(strbuf, format, arguments);
-    va_end(arguments);
-}
-
-void ffStrbufSetVF(FFstrbuf* strbuf, const char* format, va_list arguments)
-{
-    ffStrbufClear(strbuf);
-    ffStrbufAppendVF(strbuf, format, arguments);
+    for(strbuf->length = 0; strbuf->chars[strbuf->length] != '\0'; ++strbuf->length);
 }
 
 void ffStrbufAppend(FFstrbuf* strbuf, const FFstrbuf* value)
@@ -182,17 +101,10 @@ void ffStrbufAppend(FFstrbuf* strbuf, const FFstrbuf* value)
     ffStrbufAppendNS(strbuf, value->length, value->chars);
 }
 
-void ffStrbufAppendTransformS(FFstrbuf* strbuf, const char* value, int(*transformFunc)(int))
+void ffStrbufAppendC(FFstrbuf* strbuf, char c)
 {
-    if(value == NULL)
-        return;
-
-    for(uint32_t i = 0; value[i] != '\0'; i++)
-    {
-        if(i % 16 == 0)
-            ffStrbufEnsureFree(strbuf, 16);
-        strbuf->chars[strbuf->length++] = (char) transformFunc(value[i]);
-    }
+    ffStrbufEnsureFree(strbuf, 1);
+    strbuf->chars[strbuf->length++] = c;
     strbuf->chars[strbuf->length] = '\0';
 }
 
@@ -229,23 +141,6 @@ void ffStrbufAppendNS(FFstrbuf* strbuf, uint32_t length, const char* value)
     strbuf->chars[strbuf->length] = '\0';
 }
 
-void ffStrbufAppendSExcludingC(FFstrbuf* strbuf, const char* value, char exclude)
-{
-    if(value == NULL)
-        return;
-
-    for(uint32_t i = 0; value[i] != '\0'; i++)
-    {
-        if(i % 16 == 0)
-            ffStrbufEnsureFree(strbuf, 16);
-
-        if(value[i] != exclude)
-            strbuf->chars[strbuf->length++] = value[i];
-    }
-
-    strbuf->chars[strbuf->length] = '\0';
-}
-
 void ffStrbufAppendNSExludingC(FFstrbuf* strbuf, uint32_t length, const char* value, char exclude)
 {
     if(value == NULL)
@@ -262,22 +157,18 @@ void ffStrbufAppendNSExludingC(FFstrbuf* strbuf, uint32_t length, const char* va
     strbuf->chars[strbuf->length] = '\0';
 }
 
-void ffStrbufAppendC(FFstrbuf* strbuf, char c)
+void ffStrbufAppendTransformS(FFstrbuf* strbuf, const char* value, int(*transformFunc)(int))
 {
-    ffStrbufEnsureFree(strbuf, 1);
-    strbuf->chars[strbuf->length++] = c;
-    strbuf->chars[strbuf->length] = '\0';
-}
-
-void ffStrbufAppendF(FFstrbuf* strbuf, const char* format, ...)
-{
-    if(format == NULL)
+    if(value == NULL)
         return;
 
-    va_list arguments;
-    va_start(arguments, format);
-    ffStrbufAppendVF(strbuf, format, arguments);
-    va_end(arguments);
+    for(uint32_t i = 0; value[i] != '\0'; i++)
+    {
+        if(i % 16 == 0)
+            ffStrbufEnsureFree(strbuf, 16);
+        strbuf->chars[strbuf->length++] = (char) transformFunc(value[i]);
+    }
+    strbuf->chars[strbuf->length] = '\0';
 }
 
 void ffStrbufAppendVF(FFstrbuf* strbuf, const char* format, va_list arguments)
@@ -298,23 +189,27 @@ void ffStrbufAppendVF(FFstrbuf* strbuf, const char* format, va_list arguments)
     strbuf->chars[strbuf->length] = '\0';
 }
 
-char ffStrbufGetC(FFstrbuf* strbuf, uint32_t index)
+void ffStrbufAppendF(FFstrbuf* strbuf, const char* format, ...)
 {
-    if(index >= strbuf->length)
-        return '\0';
+    if(format == NULL)
+        return;
 
-    return strbuf->chars[index];
+    va_list arguments;
+    va_start(arguments, format);
+    ffStrbufAppendVF(strbuf, format, arguments);
+    va_end(arguments);
 }
 
-void ffStrbufWriteTo(const FFstrbuf* strbuf, FILE* file)
+void ffStrbufSet(FFstrbuf* strbuf, const FFstrbuf* value)
 {
-    fwrite(strbuf->chars, sizeof(char), strbuf->length, file);
+    ffStrbufClear(strbuf);
+    ffStrbufAppendNS(strbuf, value->length, value->chars);
 }
 
-void ffStrbufPutTo(const FFstrbuf* strbuf, FILE* file)
+void ffStrbufSetS(FFstrbuf* strbuf, const char* value)
 {
-    fwrite(strbuf->chars, sizeof(char), strbuf->length, file);
-    fputc('\n', file);
+    ffStrbufClear(strbuf);
+    ffStrbufAppendS(strbuf, value);
 }
 
 int ffStrbufComp(const FFstrbuf* strbuf, const FFstrbuf* comp)
@@ -370,42 +265,40 @@ void ffStrbufTrim(FFstrbuf* strbuf, char c)
     ffStrbufTrimLeft(strbuf, c);
 }
 
-static bool strbufRemoveTest(FFstrbuf* strbuf, uint32_t i, const char* substr)
+void ffStrbufRemoveSubstr(FFstrbuf* strbuf, uint32_t startIndex, uint32_t endIndex)
 {
-    uint32_t k;
-    for(k = 0; substr[k] != '\0'; k++)
-    {
-        if(i + k > strbuf->length)
-            return false;
+    if(startIndex > strbuf->length || startIndex >= endIndex)
+        return;
 
-        if(strbuf->chars[i + k] != substr[k])
-            return false;
+    if(endIndex > strbuf->length)
+    {
+        ffStrbufSubstrBefore(strbuf, startIndex);
+        return;
     }
 
-    memmove(&strbuf->chars[i], &strbuf->chars[i + k], strbuf->length - i - k);
-    strbuf->length -= k;
+    memmove(strbuf->chars + startIndex, strbuf->chars + endIndex, strbuf->length - endIndex);
+    strbuf->length -= (endIndex - startIndex);
     strbuf->chars[strbuf->length] = '\0';
-    return true;
+}
+
+void ffStrbufRemoveS(FFstrbuf* strbuf, const char* str)
+{
+    uint32_t stringLength = (uint32_t) strlen(str);
+
+    for(uint32_t i = ffStrbufNextIndexS(strbuf, 0, str); i < strbuf->length; i = ffStrbufNextIndexS(strbuf, i, str))
+        ffStrbufRemoveSubstr(strbuf, i, i + stringLength);
 }
 
 void ffStrbufRemoveStringsA(FFstrbuf* strbuf, uint32_t numStrings, const char* strings[])
 {
-    for(uint32_t k = 0; k < numStrings; k++)
-    {
-        for(uint32_t i = 0; i < strbuf->length; i++)
-            while(strbufRemoveTest(strbuf, i, strings[k]));
-    }
+    for(uint32_t i = 0; i < numStrings; i++)
+        ffStrbufRemoveS(strbuf, strings[i]);
 }
 
 void ffStrbufRemoveStringsV(FFstrbuf* strbuf, uint32_t numStrings, va_list arguments)
 {
-    const char** strings = calloc(numStrings, sizeof(const char*));
     for(uint32_t i = 0; i < numStrings; i++)
-        strings[i] = va_arg(arguments, const char*);
-
-    ffStrbufRemoveStringsA(strbuf, numStrings, strings);
-
-    free(strings);
+        ffStrbufRemoveS(strbuf, va_arg(arguments, const char*));
 }
 
 void ffStrbufRemoveStrings(FFstrbuf* strbuf, uint32_t numStrings, ...)
@@ -426,28 +319,18 @@ uint32_t ffStrbufNextIndexC(const FFstrbuf* strbuf, uint32_t start, char c)
     return strbuf->length;
 }
 
-static bool strbufCharsLeft(uint32_t i, const void* strbuf)
-{
-    return i < ((const FFstrbuf*) strbuf)->length;
-}
-
-static bool strbufCharsLeftS(uint32_t i, const void* str)
-{
-    return ((const char*) str)[i] != '\0';
-}
-
-static uint32_t strbufNextIndex(const FFstrbuf* strbuf, uint32_t start, const char* chars, const void* container, bool(*charsLeft)(uint32_t, const void*))
+uint32_t ffStrbufNextIndexS(const FFstrbuf* strbuf, uint32_t start, const char* str)
 {
     for(uint32_t i = start; i < strbuf->length; i++)
     {
         bool found = true;
 
-        for(uint32_t k = 0; charsLeft(k, container); k++)
+        for(uint32_t k = 0; str[k] != '\0'; k++)
         {
             if(i + k == strbuf->length)
                 return strbuf->length;
 
-            if(strbuf->chars[i + k] != chars[k])
+            if(strbuf->chars[i + k] != str[k])
             {
                 found = false;
                 break;
@@ -461,16 +344,6 @@ static uint32_t strbufNextIndex(const FFstrbuf* strbuf, uint32_t start, const ch
     return strbuf->length;
 }
 
-uint32_t ffStrbufNextIndex(const FFstrbuf* strbuf, uint32_t start, const FFstrbuf* searched)
-{
-    return strbufNextIndex(strbuf, start, searched->chars, searched, strbufCharsLeft);
-}
-
-uint32_t ffStrbufNextIndexS(const FFstrbuf* strbuf, uint32_t start, const char* str)
-{
-    return strbufNextIndex(strbuf, start, str, str, strbufCharsLeftS);
-}
-
 uint32_t ffStrbufFirstIndexC(const FFstrbuf* strbuf, char c)
 {
     return ffStrbufNextIndexC(strbuf, 0, c);
@@ -478,7 +351,7 @@ uint32_t ffStrbufFirstIndexC(const FFstrbuf* strbuf, char c)
 
 uint32_t ffStrbufFirstIndex(const FFstrbuf* strbuf, const FFstrbuf* searched)
 {
-    return ffStrbufNextIndex(strbuf, 0, searched);
+    return ffStrbufNextIndexS(strbuf, 0, searched->chars);
 }
 
 uint32_t ffStrbufFirstIndexS(const FFstrbuf* strbuf, const char* str)
@@ -546,7 +419,10 @@ void ffStrbufSubstrAfterFirstC(FFstrbuf* strbuf, char c)
 
 void ffStrbufSubstrAfterFirstS(FFstrbuf* strbuf, const char* str)
 {
-    uint32_t index = ffStrbufFirstIndexS(strbuf, str) + (uint32_t) strlen(str);
+    if(*str == '\0')
+        return;
+
+    uint32_t index = ffStrbufFirstIndexS(strbuf, str) + (uint32_t) strlen(str) - 1; // -1, because firstIndexS is already pointing to str[0], we want to add only the remaining length
     if(index < strbuf->length)
         ffStrbufSubstrAfter(strbuf, index);
 }
@@ -558,11 +434,6 @@ void ffStrbufSubstrAfterLastC(FFstrbuf* strbuf, char c)
         ffStrbufSubstrAfter(strbuf, index);
 }
 
-bool ffStrbufStartsWith(const FFstrbuf* strbuf, const FFstrbuf* start)
-{
-    return ffStrbufStartsWithNS(strbuf, start->length, start->chars);
-}
-
 bool ffStrbufStartsWithS(const FFstrbuf* strbuf, const char* start)
 {
     for(uint32_t i = 0; start[i] != '\0'; i++)
@@ -576,22 +447,9 @@ bool ffStrbufStartsWithS(const FFstrbuf* strbuf, const char* start)
     return true;
 }
 
-bool ffStrbufStartsWithNS(const FFstrbuf* strbuf, uint32_t length, const char* start)
-{
-    for(uint32_t i = 0; i < length; i++)
-    {
-        if(i >= strbuf->length)
-            return false;
-
-        if(strbuf->chars[i] != start[i])
-            return false;
-    }
-    return true;
-}
-
 bool ffStrbufStartsWithIgnCase(const FFstrbuf* strbuf, const FFstrbuf* start)
 {
-    return ffStrbufStartsWithNS(strbuf, start->length, start->chars);
+    return ffStrbufStartsWithS(strbuf, start->chars);
 }
 
 bool ffStrbufStartsWithIgnCaseS(const FFstrbuf* strbuf, const char* start)
@@ -607,19 +465,6 @@ bool ffStrbufStartsWithIgnCaseS(const FFstrbuf* strbuf, const char* start)
     return true;
 }
 
-bool ffStrbufStartsWithIgnCaseNS(const FFstrbuf* strbuf, uint32_t length, const char* start)
-{
-    for(uint32_t i = 0; i < length; i++)
-    {
-        if(i >= strbuf->length)
-            return false;
-
-        if(tolower(strbuf->chars[i]) != tolower(start[i]))
-            return false;
-    }
-    return true;
-}
-
 bool ffStrbufEndsWithC(const FFstrbuf* strbuf, char c)
 {
     return strbuf->length == 0 ? false :
@@ -633,9 +478,9 @@ bool ffStrbufEndsWithS(const FFstrbuf* strbuf, const char* end)
     if(endLength > strbuf->length)
         return false;
 
-    for(uint32_t i = 0; i < endLength; ++i)
+    for(uint32_t i = endLength; i > 0; i--)
     {
-        if(strbuf->chars[strbuf->length - endLength + i] != end[i])
+        if(strbuf->chars[strbuf->length - endLength + i - 1] != end[i - 1])
             return false;
     }
 
@@ -658,12 +503,6 @@ static bool testEndsWithIgnCaseS(const FFstrbuf* strbuf, const char* end, uint32
     return true;
 }
 
-bool ffStrbufEndsWithIgnCaseS(const FFstrbuf* strbuf, const char* end)
-{
-    uint32_t dummy;
-    return testEndsWithIgnCaseS(strbuf, end, &dummy);
-}
-
 bool ffStrbufRemoveIgnCaseEndS(FFstrbuf* strbuf, const char* end)
 {
     uint32_t endLength;
@@ -676,9 +515,15 @@ bool ffStrbufRemoveIgnCaseEndS(FFstrbuf* strbuf, const char* end)
     return false;
 }
 
-void ffStrbufRecalculateLength(FFstrbuf* strbuf)
+void ffStrbufWriteTo(const FFstrbuf* strbuf, FILE* file)
 {
-    for(strbuf->length = 0; strbuf->chars[strbuf->length] != '\0'; ++strbuf->length);
+    fwrite(strbuf->chars, sizeof(*strbuf->chars), strbuf->length, file);
+}
+
+void ffStrbufPutTo(const FFstrbuf* strbuf, FILE* file)
+{
+    ffStrbufWriteTo(strbuf, file);
+    fputc('\n', file);
 }
 
 void ffStrbufDestroy(FFstrbuf* strbuf)
diff --git a/src/util/FFstrbuf.h b/src/util/FFstrbuf.h
index f6201780f..7b0ab3311 100644
--- a/src/util/FFstrbuf.h
+++ b/src/util/FFstrbuf.h
@@ -20,16 +20,8 @@ typedef struct FFstrbuf
 #define FF_STRBUF_CREATE(name) FFstrbuf name; ffStrbufInit(&name);
 
 void ffStrbufInit(FFstrbuf* strbuf);
-void ffStrbufInitCopy(FFstrbuf* strbuf, const FFstrbuf* src);
-void ffStrbufInitS(FFstrbuf* strbuf, const char* value);
-void ffStrbufInitNS(FFstrbuf* strbuf, uint32_t length, const char* value);
-void ffStrbufInitC(FFstrbuf* strbuf, char c);
 void ffStrbufInitA(FFstrbuf* strbuf, uint32_t allocate);
-void ffStrbufInitAS(FFstrbuf* strbuf, uint32_t allocate, const char* value);
-void ffStrbufInitANS(FFstrbuf* strbuf, uint32_t allocate, uint32_t length, const char* value);
-void ffStrbufInitAC(FFstrbuf* strbuf, uint32_t allocate, char c);
-void ffStrbufInitF(FFstrbuf* strbuf, const char* format, ...);
-void ffStrbufInitVF(FFstrbuf* strbuf, const char* format, va_list arguments);
+void ffStrbufInitCopy(FFstrbuf* strbuf, const FFstrbuf* src);
 
 void ffStrbufEnsureCapacity(FFstrbuf* strbuf, uint32_t allocate);
 void ffStrbufEnsureFree(FFstrbuf* strbuf, uint32_t free);
@@ -38,27 +30,19 @@ uint32_t ffStrbufGetFree(const FFstrbuf* strbuf);
 
 void ffStrbufClear(FFstrbuf* strbuf);
 
-void ffStrbufSet(FFstrbuf* strbuf, const FFstrbuf* value);
-void ffStrbufSetS(FFstrbuf* strbuf, const char* value);
-void ffStrbufSetNS(FFstrbuf* strbuf, uint32_t length, const char* value);
-void ffStrbufSetC(FFstrbuf* strbuf, char c);
-void ffStrbufSetF(FFstrbuf* strbuf, const char* format, ...);
-void ffStrbufSetVF(FFstrbuf* strbuf, const char* format, va_list arguments);
+void ffStrbufRecalculateLength(FFstrbuf* strbuf);
 
 void ffStrbufAppend(FFstrbuf* strbuf, const FFstrbuf* value);
-void ffStrbufAppendTransformS(FFstrbuf* strbuf, const char* value, int(*transformFunc)(int));
-void ffStrbufAppendSExcludingC(FFstrbuf* strbuf, const char* value, char exclude);
-void ffStrbufAppendNSExludingC(FFstrbuf* strbuf, uint32_t length, const char* value, char exclude);
+void ffStrbufAppendC(FFstrbuf* strbuf, char c);
 void ffStrbufAppendS(FFstrbuf* strbuf, const char* value);
 void ffStrbufAppendNS(FFstrbuf* strbuf, uint32_t length, const char* value);
-void ffStrbufAppendC(FFstrbuf* strbuf, char c);
+void ffStrbufAppendNSExludingC(FFstrbuf* strbuf, uint32_t length, const char* value, char exclude);
+void ffStrbufAppendTransformS(FFstrbuf* strbuf, const char* value, int(*transformFunc)(int));
 void ffStrbufAppendF(FFstrbuf* strbuf, const char* format, ...);
 void ffStrbufAppendVF(FFstrbuf* strbuf, const char* format, va_list arguments);
 
-char ffStrbufGetC(FFstrbuf* strbuf, uint32_t index);
-
-void ffStrbufWriteTo(const FFstrbuf* strbuf, FILE* file);
-void ffStrbufPutTo(const FFstrbuf* strbuf, FILE* file);
+void ffStrbufSet(FFstrbuf* strbuf, const FFstrbuf* value);
+void ffStrbufSetS(FFstrbuf* strbuf, const char* value);
 
 int ffStrbufComp(const FFstrbuf* strbuf, const FFstrbuf* comp);
 int ffStrbufCompS(const FFstrbuf* strbuf, const char* comp);
@@ -70,12 +54,13 @@ void ffStrbufTrimLeft(FFstrbuf* strbuf, char c);
 void ffStrbufTrimRight(FFstrbuf* strbuf, char c);
 void ffStrbufTrim(FFstrbuf* strbuf, char c);
 
+void ffStrbufRemoveSubstr(FFstrbuf* strbuf, uint32_t startIndex, uint32_t endIndex);
+void ffStrbufRemoveS(FFstrbuf* strbuf, const char* str);
 void ffStrbufRemoveStringsA(FFstrbuf* strbuf, uint32_t numStrings, const char* strings[]);
 void ffStrbufRemoveStringsV(FFstrbuf* strbuf, uint32_t numStrings, va_list arguments);
 void ffStrbufRemoveStrings(FFstrbuf* strbuf, uint32_t numStrings, ...);
 
 uint32_t ffStrbufNextIndexC(const FFstrbuf* strbuf, uint32_t start, char c);
-uint32_t ffStrbufNextIndex(const FFstrbuf* strbuf, uint32_t start, const FFstrbuf* searched);
 uint32_t ffStrbufNextIndexS(const FFstrbuf* strbuf, uint32_t start, const char* str);
 
 uint32_t ffStrbufFirstIndexC(const FFstrbuf* strbuf, char c);
@@ -94,22 +79,18 @@ void ffStrbufSubstrAfterFirstC(FFstrbuf* strbuf, char c);
 void ffStrbufSubstrAfterFirstS(FFstrbuf* strbuf, const char* str);
 void ffStrbufSubstrAfterLastC(FFstrbuf* strbuf, char c);
 
-bool ffStrbufStartsWith(const FFstrbuf* strbuf, const FFstrbuf* start);
 bool ffStrbufStartsWithS(const FFstrbuf* strbuf, const char* start);
-bool ffStrbufStartsWithNS(const FFstrbuf* strbuf, uint32_t length, const char* start);
 
 bool ffStrbufStartsWithIgnCase(const FFstrbuf* strbuf, const FFstrbuf* start);
 bool ffStrbufStartsWithIgnCaseS(const FFstrbuf* strbuf, const char* start);
-bool ffStrbufStartsWithIgnCaseNS(const FFstrbuf* strbuf, uint32_t length, const char* start);
 
 bool ffStrbufEndsWithC(const FFstrbuf* strbuf, char c);
 bool ffStrbufEndsWithS(const FFstrbuf* strbuf, const char* end);
 
-bool ffStrbufEndsWithIgnCaseS(const FFstrbuf* strbuf, const char* end);
-
 bool ffStrbufRemoveIgnCaseEndS(FFstrbuf* strbuf, const char* end);
 
-void ffStrbufRecalculateLength(FFstrbuf* strbuf);
+void ffStrbufWriteTo(const FFstrbuf* strbuf, FILE* file);
+void ffStrbufPutTo(const FFstrbuf* strbuf, FILE* file);
 
 void ffStrbufDestroy(FFstrbuf* strbuf);
 
diff --git a/tests/performance.sh b/tests/performance.sh
index 17d926825..e7c7e7a00 100755
--- a/tests/performance.sh
+++ b/tests/performance.sh
@@ -2,6 +2,6 @@
 rm -rf tests/build/
 mkdir -p tests/build/
 cd tests/build/
-cmake ../.. -DBUILD_TESTS=ON
-cmake --build . -j$(nproc) --target fastfetch-test-performance
+cmake ../..
+cmake --build . --target fastfetch-test-performance -j$(nproc)
 ./fastfetch-test-performance "$@"
diff --git a/tests/strbuf.c b/tests/strbuf.c
new file mode 100644
index 000000000..6d0eae8bc
--- /dev/null
+++ b/tests/strbuf.c
@@ -0,0 +1,61 @@
+#include "fastfetch.h"
+
+#include <string.h>
+#include <stdarg.h>
+
+static void testFailed(const FFstrbuf* strbuf, const char* message, ...)
+{
+    va_list args;
+    va_start(args, message);
+    fputs(FASTFETCH_TEXT_MODIFIER_ERROR, stderr);
+    vfprintf(stderr, message, args);
+    fputs(", strbuf: ", stderr);
+    ffStrbufWriteTo(strbuf, stderr);
+    fputs(FASTFETCH_TEXT_MODIFIER_RESET, stderr);
+    fputc('\n', stderr);
+    va_end(args);
+    exit(1);
+}
+
+int main(int argc, char** argv)
+{
+    FF_UNUSED(argc, argv)
+
+    FFstrbuf strbuf;
+    ffStrbufInitA(&strbuf, 64);
+
+    if(strbuf.allocated != 64)
+        testFailed(&strbuf, "strbuf.allocated != 64");
+
+    if(strbuf.length != 0)
+        testFailed(&strbuf, "testSrbuf.length != 0");
+
+    ffStrbufAppendS(&strbuf, "123456789");
+
+    if(strbuf.length != 9)
+        testFailed(&strbuf, "strbuf.length != 9");
+
+    if(strcmp(strbuf.chars, "123456789") != 0)
+        testFailed(&strbuf, "strbuf.data != \"123456789\"");
+
+    if(!ffStrbufStartsWithS(&strbuf, "123"))
+        testFailed(&strbuf, "!ffStrbufStartsWithS(&strbuf, \"123\")");
+
+    ffStrbufRemoveS(&strbuf, "78");
+
+    if(strbuf.length != 7)
+        testFailed(&strbuf, "strbuf.length != 7");
+
+    if(strcmp(strbuf.chars, "1234569") != 0)
+        testFailed(&strbuf, "strcmp(strbuf.chars, \"123469\") != 0");
+
+    ffStrbufRemoveStrings(&strbuf, 3, "23", "45", "9");
+
+    if(strbuf.length != 2)
+        testFailed(&strbuf, "strbuf.length != 2");
+
+    if(strcmp(strbuf.chars, "16") != 0)
+        testFailed(&strbuf, "strbuf.chars != \"126\"");
+
+    puts("\033[32mAll tests passed!"FASTFETCH_TEXT_MODIFIER_RESET);
+}
diff --git a/tests/strbuf.sh b/tests/strbuf.sh
new file mode 100755
index 000000000..4b981f56b
--- /dev/null
+++ b/tests/strbuf.sh
@@ -0,0 +1,7 @@
+#!/bin/env sh
+rm -rf tests/build/
+mkdir -p tests/build/
+cd tests/build/
+cmake ../..
+cmake --build . --target fastfetch-test-strbuf -j$(nproc)
+./fastfetch-test-strbuf "$@"