diff --git a/src/Components/AppShell/index.tsx b/src/Components/AppShell/index.tsx
index 839a969c..72464ef5 100644
--- a/src/Components/AppShell/index.tsx
+++ b/src/Components/AppShell/index.tsx
@@ -1,4 +1,4 @@
-export { AppShell } from './AppShell'
+export * from './AppShell'
 export { SideBar } from './SideBar'
 export { Content } from './Content'
 export { Sitemap } from './Sitemap'
diff --git a/src/Components/Auth/index.tsx b/src/Components/Auth/index.tsx
index 2a53f98d..f2231185 100644
--- a/src/Components/Auth/index.tsx
+++ b/src/Components/Auth/index.tsx
@@ -1,4 +1,4 @@
-export { AuthProvider, useAuth } from './useAuth'
+export * from './useAuth'
 export { LoginPage } from './LoginPage'
 export { SignupPage } from './SignupPage'
 export { RequestPasswordPage } from './RequestPasswordPage'
diff --git a/src/Components/Map/index.tsx b/src/Components/Map/index.tsx
index df970712..6ef08d6c 100644
--- a/src/Components/Map/index.tsx
+++ b/src/Components/Map/index.tsx
@@ -1,7 +1,7 @@
 export { UtopiaMap } from './UtopiaMap'
-export { Layer } from './Layer'
+export * from './Layer'
 export { Tags } from './Tags'
-export { Permissions } from './Permissions'
+export * from './Permissions'
 export { ItemForm } from './ItemForm'
 export { ItemView } from './ItemView'
 export { PopupTextAreaInput } from './Subcomponents/ItemPopupComponents/PopupTextAreaInput'
diff --git a/src/index.tsx b/src/index.tsx
index 145d1719..0e6c5864 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,41 +1,12 @@
 import './index.css'
 
-export {
-  UtopiaMap,
-  Layer,
-  Tags,
-  Permissions,
-  ItemForm,
-  ItemView,
-  PopupTextAreaInput,
-  PopupStartEndInput,
-  PopupTextInput,
-  PopupButton,
-  TextView,
-  StartEndView,
-  PopupCheckboxInput,
-} from './Components/Map'
-export { AppShell, Content, SideBar, Sitemap } from './Components/AppShell'
-export {
-  AuthProvider,
-  LoginPage,
-  SignupPage,
-  RequestPasswordPage,
-  SetNewPasswordPage,
-} from './Components/Auth'
-export { UserSettings, ProfileView, ProfileForm } from './Components/Profile'
-export { Quests, Modal } from './Components/Gaming'
-export {
-  TitleCard,
-  CardPage,
-  MapOverlayPage,
-  OverlayItemsIndexPage,
-  MoonCalendar,
-  SelectUser,
-  AttestationForm,
-  MarketView,
-} from './Components/Templates'
-export { TextInput, TextAreaInput, SelectBox } from './Components/Input'
+export * from './Components/Map'
+export * from './Components/AppShell'
+export * from './Components/Auth'
+export * from './Components/Profile'
+export * from './Components/Gaming'
+export * from './Components/Templates'
+export * from './Components/Input'
 
 declare global {
   interface Window {