diff --git a/package.json b/package.json
index 09dcc3e4..9467d43c 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "lint": "eslint --ext .ts,.tsx src/",
     "lint:fix": "eslint --fix --ext .ts,.tsx src/",
     "typecheck": "tsc --noEmit",
-    "docs": "typedoc --readme README.md src/",
+    "docs": "typedoc --plugin @mxssfd/typedoc-theme --theme my-theme --readme README.md src/",
     "fmt": "prettier --write 'src/**/*.{js,jsx,ts,tsx}'",
     "fmt:check": "prettier --check 'src/**/*.{js,jsx,ts,tsx}'"
   },
@@ -24,6 +24,7 @@
   "description": "Library for interacting with the Revolt API.",
   "packageManager": "pnpm@7.14.2",
   "dependencies": {
+    "@mxssfd/typedoc-theme": "^1.1.1",
     "@solid-primitives/map": "^0.4.3",
     "@solid-primitives/set": "^0.4.3",
     "eventemitter3": "^5.0.0",
diff --git a/src/hydration/index.ts b/src/hydration/index.ts
index 9d8173f9..cabdb598 100644
--- a/src/hydration/index.ts
+++ b/src/hydration/index.ts
@@ -7,6 +7,11 @@ import { serverHydration } from "./server";
 import { serverMemberHydration } from "./serverMember";
 import { userHydration } from "./user";
 
+export { BotFlags } from "./bot";
+export { ServerFlags } from "./server";
+export { UserBadges, UserFlags } from "./user";
+
+export type { HydratedBot } from "./bot";
 export type { HydratedChannel } from "./channel";
 export type { HydratedChannelUnread } from "./channelUnread";
 export type { HydratedEmoji } from "./emoji";
diff --git a/src/index.ts b/src/index.ts
index 2da0e340..646de192 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,6 +1,8 @@
-export { Client } from "./Client";
-export type { Session } from "./Client";
-
 export * from "./classes";
 export * from "./lib/regex";
+export * from "./collections";
 export * as API from "revolt-api";
+export type { Session } from "./Client";
+export { Client, ClientOptions } from "./Client";
+export { EventClient, ConnectionState } from "./events";
+export { ServerFlags, UserBadges, UserFlags, BotFlags } from "./hydration";