diff --git a/src/format.ts b/src/format.ts
index ffe216c..98d65d6 100644
--- a/src/format.ts
+++ b/src/format.ts
@@ -47,6 +47,5 @@ interface Format {
 
 // ----- Exports ----- //
 
-export { Pillar, Special, Theme, Design, Display };
-
-export type { Format };
+export type { Theme, Format };
+export { Pillar, Special, Design, Display };
diff --git a/src/index.ts b/src/index.ts
index 8964518..9de609d 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,7 +1,7 @@
 // ----- Types ----- //
 
-export type { Format } from './format';
-export { Pillar, Special, Theme, Design, Display } from './format';
+export type { Theme, Format } from './format';
+export { Pillar, Special, Design, Display } from './format';
 
 export type {
 	OphanABEvent,
diff --git a/src/ophan.ts b/src/ophan.ts
index 78c70f8..8cfad3b 100644
--- a/src/ophan.ts
+++ b/src/ophan.ts
@@ -87,7 +87,7 @@ type TestMeta = {
 	products?: OphanProduct[];
 };
 
-export {
+export type {
 	OphanABEvent,
 	OphanABPayload,
 	OphanAction,