diff --git a/api/src/routes/gifs/search.ts b/api/src/routes/gifs/search.ts
new file mode 100644
index 00000000..45b3ddca
--- /dev/null
+++ b/api/src/routes/gifs/search.ts
@@ -0,0 +1,24 @@
+import { Router, Response, Request } from "express";
+import fetch from "node-fetch";
+import { route } from "@fosscord/api";
+import { getGifApiKey, parseGifResult } from "./trending";
+
+const router = Router();
+
+router.get("/", route({}), async (req: Request, res: Response) => {
+	// TODO: Custom providers
+	const { q, media_format, locale } = req.query;
+
+	const apiKey = getGifApiKey();
+
+	const response = await fetch(`https://g.tenor.com/v1/search?q=${q}&media_format=${media_format}&locale=${locale}&key=${apiKey}`, {
+		method: "get",
+		headers: { "Content-Type": "application/json" }
+	});
+
+	const { results } = await response.json();
+
+	res.json(results.map(parseGifResult)).status(200);
+});
+
+export default router;
diff --git a/api/src/routes/gifs/trending-gifs.ts b/api/src/routes/gifs/trending-gifs.ts
new file mode 100644
index 00000000..b5f87222
--- /dev/null
+++ b/api/src/routes/gifs/trending-gifs.ts
@@ -0,0 +1,24 @@
+import { Router, Response, Request } from "express";
+import fetch from "node-fetch";
+import { route } from "@fosscord/api";
+import { getGifApiKey, parseGifResult } from "./trending";
+
+const router = Router();
+
+router.get("/", route({}), async (req: Request, res: Response) => {
+	// TODO: Custom providers
+	const { media_format, locale } = req.query;
+
+	const apiKey = getGifApiKey();
+
+	const response = await fetch(`https://g.tenor.com/v1/trending?media_format=${media_format}&locale=${locale}&key=${apiKey}`, {
+		method: "get",
+		headers: { "Content-Type": "application/json" }
+	});
+
+	const { results } = await response.json();
+
+	res.json(results.map(parseGifResult)).status(200);
+});
+
+export default router;
diff --git a/api/src/routes/gifs/trending.ts b/api/src/routes/gifs/trending.ts
new file mode 100644
index 00000000..7ee9337e
--- /dev/null
+++ b/api/src/routes/gifs/trending.ts
@@ -0,0 +1,57 @@
+import { Router, Response, Request } from "express";
+import fetch from "node-fetch";
+import { route } from "@fosscord/api";
+import { Config } from "@fosscord/util";
+import { HTTPError } from "lambert-server";
+
+const router = Router();
+
+export function parseGifResult(result: any) {
+	return {
+		id: result.id,
+		title: result.title,
+		url: result.itemurl,
+		src: result.media[0].mp4.url,
+		gif_src: result.media[0].gif.url,
+		width: result.media[0].mp4.dims[0],
+		height: result.media[0].mp4.dims[1],
+		preview: result.media[0].mp4.preview
+	};
+}
+
+export function getGifApiKey() {
+	const { enabled, provider, apiKey } = Config.get().gif;
+	if (!enabled) throw new HTTPError(`Gifs are disabled`);
+	if (provider !== "tenor" || !apiKey) throw new HTTPError(`${provider} gif provider not supported`);
+
+	return apiKey;
+}
+
+router.get("/", route({}), async (req: Request, res: Response) => {
+	// TODO: Custom providers
+	// TODO: return gifs as mp4
+	const { media_format, locale } = req.query;
+
+	const apiKey = getGifApiKey();
+
+	const [responseSource, trendGifSource] = await Promise.all([
+		fetch(`https://g.tenor.com/v1/categories?locale=${locale}&key=${apiKey}`, {
+			method: "get",
+			headers: { "Content-Type": "application/json" }
+		}),
+		fetch(`https://g.tenor.com/v1/trending?locale=${locale}&key=${apiKey}`, {
+			method: "get",
+			headers: { "Content-Type": "application/json" }
+		})
+	]);
+
+	const { tags } = await responseSource.json();
+	const { results } = await trendGifSource.json();
+
+	res.json({
+		categories: tags.map((x: any) => ({ name: x.searchterm, src: x.image })),
+		gifs: [parseGifResult(results[0])]
+	}).status(200);
+});
+
+export default router;
diff --git a/api/src/util/Message.ts b/api/src/util/Message.ts
index f8230124..40d96b42 100644
--- a/api/src/util/Message.ts
+++ b/api/src/util/Message.ts
@@ -25,6 +25,7 @@ import cheerio from "cheerio";
 import { MessageCreateSchema } from "../routes/channels/#channel_id/messages";
 
 // TODO: check webhook, application, system author
+// TODO: embed gifs/videos/images
 
 const LINK_REGEX = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)/g;
 
diff --git a/util/src/entities/Config.ts b/util/src/entities/Config.ts
index 6760187f..b3167ac7 100644
--- a/util/src/entities/Config.ts
+++ b/util/src/entities/Config.ts
@@ -51,11 +51,6 @@ export interface ConfigValue {
 	general: {
 		instanceId: string;
 	};
-	permissions: {
-		user: {
-			createGuilds: boolean;
-		};
-	};
 	limits: {
 		user: {
 			maxGuilds: number;
@@ -154,6 +149,11 @@ export interface ConfigValue {
 			canLeave: boolean;
 		};
 	};
+	gif: {
+		enabled: boolean;
+		provider: "tenor"; // more coming soon
+		apiKey?: string;
+	};
 	rabbitmq: {
 		host: string | null;
 	};
@@ -176,11 +176,6 @@ export const DefaultConfigOptions: ConfigValue = {
 	general: {
 		instanceId: Snowflake.generate(),
 	},
-	permissions: {
-		user: {
-			createGuilds: true,
-		},
-	},
 	limits: {
 		user: {
 			maxGuilds: 100,
@@ -307,7 +302,6 @@ export const DefaultConfigOptions: ConfigValue = {
 			},
 		],
 	},
-
 	guild: {
 		showAllGuildsInDiscovery: false,
 		autoJoin: {
@@ -316,6 +310,11 @@ export const DefaultConfigOptions: ConfigValue = {
 			guilds: [],
 		},
 	},
+	gif: {
+		enabled: true,
+		provider: "tenor",
+		apiKey: "LIVDSRZULELA",
+	},
 	rabbitmq: {
 		host: null,
 	},