diff --git a/src/components/dialogs/index.ts b/src/components/dialogs/index.ts
index 1423da1..440faeb 100644
--- a/src/components/dialogs/index.ts
+++ b/src/components/dialogs/index.ts
@@ -7,16 +7,14 @@ export { default as DialogActions } from './DialogActions'
 export { default as ProgressDialog } from './ProgressDialog'
 export { default as DlcSelectionDialog } from './DlcSelectionDialog'
 export { default as AddDlcDialog } from './AddDlcDialog'
-export { default as SettingsDialog } from './SettingsDialog'
-export { default as SmokeAPISettingsDialog } from './SmokeAPISettingsDialog'
-export { default as ScreamAPISettingsDialog } from './ScreamAPISettingsDialog'
+export { default as ApiSettingsDialog } from './ApiSettingsDialog'
+export { smokeApiSettingsSpec, screamApiSettingsSpec } from './apiSettingsSpecs'
 export { default as ConflictDialog } from './ConflictDialog'
 export { default as DisclaimerDialog } from './DisclaimerDialog'
-export { default as UnlockerSelectionDialog } from './UnlockerSelectionDialog'
+export { default as UnlockerChoiceDialog } from './UnlockerChoiceDialog'
 export { default as OptInDialog } from './OptInDialog'
 export { default as RatingDialog } from './RatingDialog'
 export { default as SmokeAPIVotesDialog } from './SmokeAPIVotesDialog'
-export { default as EpicUnlockerSelectionDialog } from './EpicUnlockerSelectionDialog'
 
 // Export types
 export type { DialogProps } from './Dialog'
@@ -28,6 +26,7 @@ export type { ProgressDialogProps, InstallationInstructions } from './ProgressDi
 export type { DlcSelectionDialogProps } from './DlcSelectionDialog'
 export type { AddDlcDialogProps } from './AddDlcDialog'
 export type { ConflictDialogProps, Conflict } from './ConflictDialog'
-export type { UnlockerSelectionDialogProps } from './UnlockerSelectionDialog'
+export type { ApiSettingsDialogProps, ApiSettingsSpec, ApiSettingsField } from './ApiSettingsDialog'
+export type { UnlockerChoiceDialogProps, UnlockerChoiceOption } from './UnlockerChoiceDialog'
 export type { RatingDialogProps } from './RatingDialog'
 export type { SmokeAPIVotesDialogProps } from './SmokeAPIVotesDialog'
\ No newline at end of file
diff --git a/src/components/layout/index.ts b/src/components/layout/index.ts
index 7f3bf29..de6cbf0 100644
--- a/src/components/layout/index.ts
+++ b/src/components/layout/index.ts
@@ -1,7 +1,6 @@
 // Export all layout components
 export { default as Header } from './Header'
 export { default as Sidebar } from './Sidebar'
-export { default as AnimatedBackground } from './AnimatedBackground'
 export { default as InitialLoadingScreen } from './InitialLoadingScreen'
 export { default as ErrorBoundary } from './ErrorBoundary'
 export { default as UpdateScreen } from './UpdateScreen'
diff --git a/src/components/pages/index.ts b/src/components/pages/index.ts
new file mode 100644
index 0000000..633671f
--- /dev/null
+++ b/src/components/pages/index.ts
@@ -0,0 +1,2 @@
+export { default as OverviewPage } from './OverviewPage'
+export { default as SettingsPage } from './SettingsPage'