diff --git a/client/src/modules/bdwebapi.js b/client/src/modules/bdwebapi.js
index 7e69ba17..b077cc0f 100644
--- a/client/src/modules/bdwebapi.js
+++ b/client/src/modules/bdwebapi.js
@@ -13,23 +13,54 @@ import { request } from 'vendor';
 const APIBASE = 'ifyouareinwebtestthenyouknowwhatthisshouldbe'; // Do not push
 const ENDPOINTS = {
     'themes': `${APIBASE}/themes`,
+    'theme': id => `${APIBASE}/theme/${id}`,
     'users': `${APIBASE}/users`,
+    'user': id => `${APIBASE}/user/${id}`,
     'statistics': `${APIBASE}/statistics`
 };
 
 export default class BdWebApi {
 
-    static async getThemes() {
-        const get = await request.get(ENDPOINTS.themes);
-        return JSON.parse(get);
+    static get themes() {
+        return {
+            get: this.getThemes
+        };
     }
 
-    static async getUsers() {
-        const get = await request.get(ENDPOINTS.users);
-        return get;
+    static get users() {
+        return {
+            get: this.getUsers
+        };
     }
 
-    static async patchStatistics(json) {
-        return await request({ method: 'PATCH', url: ENDPOINTS.statistics, json });
+    static get statistics() {
+        return {
+            get: this.getStatistics,
+            patch: this.patchStatistics
+        };
+    }
+
+    static getThemes(args) {
+        if (!args) return request.get(ENDPOINTS.themes);
+        const { id } = args;
+        if (id) return request.get(ENDPOINTS.theme(id));
+
+        return request.get(ENDPOINTS.themes);
+    }
+
+    static getUsers(args) {
+        if (!args) return request.get(ENDPOINTS.users);
+        const { id } = args;
+        if (id) return request.get(ENDPOINTS.user(id));
+
+        return request.get(ENDPOINTS.users);
+    }
+
+    static getStatistics() {
+        return request.get(ENDPOINTS.statistics);
+    }
+
+    static patchStatistics(json) {
+        return request({ method: 'PATCH', url: ENDPOINTS.statistics, json });
     }
 }
diff --git a/client/src/modules/connectivity.js b/client/src/modules/connectivity.js
index af50b925..0ba450f4 100644
--- a/client/src/modules/connectivity.js
+++ b/client/src/modules/connectivity.js
@@ -11,20 +11,14 @@
 import BdWebApi from './bdwebapi';
 import { ClientLogger as Logger } from 'common';
 
-const APIBASE = 'ifyouareinwebtestthenyouknowwhatthisshouldbe'; // Do not push
-const ENDPOINTS = {
-    'themes': `${APIBASE}/themes`,
-    'users': `${APIBASE}/users`
-};
-
 export default class Connectivity {
 
     static start() {
         Logger.info('Connectivity', `Patching anonymous statistics`);
-        BdWebApi.patchStatistics({ themes: [], plugins: [] });
+        BdWebApi.statistics.patch({ themes: [], plugins: [] });
         setInterval(() => {
             Logger.info('Connectivity', `Patching anonymous statistics`);
-            BdWebApi.patchStatistics({ themes: [], plugins: [] });
+            BdWebApi.statistics.patch({ themes: [], plugins: [] });
         }, 15*60*1000);
     }