diff --git a/KomplexHubPlugin/paginators/featuredcubemapspaginator.h b/KomplexHubPlugin/paginators/featuredcubemapspaginator.h
index ac63a74..a98bcff 100644
--- a/KomplexHubPlugin/paginators/featuredcubemapspaginator.h
+++ b/KomplexHubPlugin/paginators/featuredcubemapspaginator.h
@@ -37,7 +37,7 @@ public:
     explicit FeaturedCubemapsPaginator() : WallpaperPaginator()
     {
         setUri(
-            QString::fromUtf8("%1/v2/cubemaps/featured/").arg(KOMPLEX_API_HOST)
+            QString::fromUtf8(KOMPLEX_ENDPOINT_CUBEMAPS_FEATURED)
         );
     }
 };
diff --git a/KomplexHubPlugin/paginators/featuredimagespaginator.h b/KomplexHubPlugin/paginators/featuredimagespaginator.h
index 2b75547..2aba0ac 100644
--- a/KomplexHubPlugin/paginators/featuredimagespaginator.h
+++ b/KomplexHubPlugin/paginators/featuredimagespaginator.h
@@ -37,7 +37,7 @@ public:
     explicit FeaturedImagesPaginator() : WallpaperPaginator()
     {
         setUri(
-            QString::fromUtf8("%1/v2/images/featured/").arg(KOMPLEX_API_HOST)
+            QString::fromUtf8(KOMPLEX_ENDPOINT_IMAGES_FEATURED)
         );
     }
 };
diff --git a/KomplexHubPlugin/paginators/featuredpackspaginator.h b/KomplexHubPlugin/paginators/featuredpackspaginator.h
index 989666f..3ceb468 100644
--- a/KomplexHubPlugin/paginators/featuredpackspaginator.h
+++ b/KomplexHubPlugin/paginators/featuredpackspaginator.h
@@ -37,7 +37,7 @@ public:
     explicit FeaturedPacksPaginator() : WallpaperPaginator()
     {
         setUri(
-            QString::fromUtf8("%1/v2/packs/featured/").arg(KOMPLEX_API_HOST)
+            QString::fromUtf8(KOMPLEX_ENDPOINT_PACKS_FEATURED)
         );
     }
 };
diff --git a/KomplexHubPlugin/paginators/featuredshaderspaginator.h b/KomplexHubPlugin/paginators/featuredshaderspaginator.h
index c2eabcc..4e9d2b8 100644
--- a/KomplexHubPlugin/paginators/featuredshaderspaginator.h
+++ b/KomplexHubPlugin/paginators/featuredshaderspaginator.h
@@ -37,7 +37,7 @@ public:
     explicit FeaturedShadersPaginator() : WallpaperPaginator()
     {
         setUri(
-            QString::fromUtf8("%1/v2/shaders/featured/").arg(KOMPLEX_API_HOST)
+            QString::fromUtf8(KOMPLEX_ENDPOINT_SHADERS_FEATURED)
         );
     }
 };
diff --git a/KomplexHubPlugin/paginators/newestcubemapspaginator.h b/KomplexHubPlugin/paginators/newestcubemapspaginator.h
index beadba8..626de65 100644
--- a/KomplexHubPlugin/paginators/newestcubemapspaginator.h
+++ b/KomplexHubPlugin/paginators/newestcubemapspaginator.h
@@ -37,7 +37,7 @@ public:
     explicit NewestCubemapsPaginator() : WallpaperPaginator()
     {
         setUri(
-            QString::fromUtf8("%1/v2/cubemaps/newest/").arg(KOMPLEX_API_HOST)
+            QString::fromUtf8(KOMPLEX_ENDPOINT_CUBEMAPS_NEWEST)
         );
     }
 };
diff --git a/KomplexHubPlugin/paginators/newestpackspaginator.h b/KomplexHubPlugin/paginators/newestpackspaginator.h
index 37438b5..70f08ce 100644
--- a/KomplexHubPlugin/paginators/newestpackspaginator.h
+++ b/KomplexHubPlugin/paginators/newestpackspaginator.h
@@ -37,7 +37,7 @@ public:
     explicit NewestPacksPaginator() : WallpaperPaginator()
     {
         setUri(
-            QString::fromUtf8("%1/v2/packs/newest/").arg(KOMPLEX_API_HOST)
+            QString::fromUtf8(KOMPLEX_ENDPOINT_PACKS_NEWEST)
         );
     }
 };
diff --git a/KomplexHubPlugin/paginators/newestshaderspaginator.h b/KomplexHubPlugin/paginators/newestshaderspaginator.h
index 15d4caa..1190bda 100644
--- a/KomplexHubPlugin/paginators/newestshaderspaginator.h
+++ b/KomplexHubPlugin/paginators/newestshaderspaginator.h
@@ -37,7 +37,7 @@ public:
     explicit NewestShadersPaginator() : WallpaperPaginator()
     {
         setUri(
-            QString::fromUtf8("%1/v2/shaders/newest/").arg(KOMPLEX_API_HOST)
+            QString::fromUtf8(KOMPLEX_ENDPOINT_SHADERS_NEWEST)
         );
     }
 };
diff --git a/KomplexHubPlugin/paginators/searchcubemapspaginator.h b/KomplexHubPlugin/paginators/searchcubemapspaginator.h
index 5bd6afb..1598e1c 100644
--- a/KomplexHubPlugin/paginators/searchcubemapspaginator.h
+++ b/KomplexHubPlugin/paginators/searchcubemapspaginator.h
@@ -37,7 +37,7 @@ public:
     explicit SearchCubemapsPaginator() : WallpaperPaginator()
     {
         setUri(
-            QString::fromUtf8("%1/v2/cubemaps/search/").arg(KOMPLEX_API_HOST)
+            QString::fromUtf8(KOMPLEX_ENDPOINT_CUBEMAPS_SEARCH)
         );
     }
 };
diff --git a/KomplexHubPlugin/paginators/searchimagespaginator.h b/KomplexHubPlugin/paginators/searchimagespaginator.h
index fd2558c..8efd58a 100644
--- a/KomplexHubPlugin/paginators/searchimagespaginator.h
+++ b/KomplexHubPlugin/paginators/searchimagespaginator.h
@@ -31,13 +31,15 @@
 
 #include "wallpaperpaginator.h"
 
+#include "common/komplex_global.h"
+
 class KOMPLEX_EXPORT SearchImagesPaginator : public WallpaperPaginator
 {
 public:
     explicit SearchImagesPaginator() : WallpaperPaginator()
     {
         setUri(
-            QString::fromUtf8("%1/v2/images/search/").arg(KOMPLEX_API_HOST)
+            QString::fromUtf8(KOMPLEX_ENDPOINT_IMAGES_SEARCH)
         );
     }
 };
diff --git a/KomplexHubPlugin/paginators/searchpackspaginator.h b/KomplexHubPlugin/paginators/searchpackspaginator.h
index 8705289..2077fcf 100644
--- a/KomplexHubPlugin/paginators/searchpackspaginator.h
+++ b/KomplexHubPlugin/paginators/searchpackspaginator.h
@@ -37,7 +37,7 @@ public:
     explicit SearchPacksPaginator() : WallpaperPaginator()
     {
         setUri(
-            QString::fromUtf8("%1/v2/packs/search/").arg(KOMPLEX_API_HOST)
+            QString::fromUtf8(KOMPLEX_ENDPOINT_PACKS_SEARCH)
         );
     }
 };
diff --git a/KomplexHubPlugin/paginators/searchshaderspaginator.h b/KomplexHubPlugin/paginators/searchshaderspaginator.h
index c57e174..69d2b97 100644
--- a/KomplexHubPlugin/paginators/searchshaderspaginator.h
+++ b/KomplexHubPlugin/paginators/searchshaderspaginator.h
@@ -37,7 +37,7 @@ public:
     explicit SearchShadersPaginator() : WallpaperPaginator()
     {
         setUri(
-            QString::fromUtf8("%1/v2/shaders/search/").arg(KOMPLEX_API_HOST)
+            QString::fromUtf8(KOMPLEX_ENDPOINT_SHADERS_SEARCH)
         );
     }
 };
diff --git a/KomplexHubPlugin/paginators/searchvideospaginator.h b/KomplexHubPlugin/paginators/searchvideospaginator.h
index 5fca450..0b5ebe3 100644
--- a/KomplexHubPlugin/paginators/searchvideospaginator.h
+++ b/KomplexHubPlugin/paginators/searchvideospaginator.h
@@ -37,7 +37,7 @@ public:
     explicit SearchVideosPaginator() : WallpaperPaginator()
     {
         setUri(
-            QString::fromUtf8("%1/v2/videos/search/").arg(KOMPLEX_API_HOST)
+            QString::fromUtf8(KOMPLEX_ENDPOINT_VIDEOS_SEARCH)
         );
     }
 };