diff --git a/src/app/Analytics.ts b/src/app/Analytics.ts
index 2a1a30c9..807c34e5 100644
--- a/src/app/Analytics.ts
+++ b/src/app/Analytics.ts
@@ -11,7 +11,6 @@ export namespace Analytics {
 	const DIM_THEME = 1
 	const DIM_VERSION = 3
 	const DIM_LANGUAGE = 4
-	const DIM_PREVIEW = 5
 	const DIM_GENERATOR = 6
 	const DIM_PREFERS_COLOR_SCHEME = 7
 
@@ -64,15 +63,11 @@ export namespace Analytics {
 		})
 	}
 
-	export function setPreview(preview: string) {
-		dimension(DIM_PREVIEW, preview)
-		event(ID_GENERATOR, 'set-preview', preview)
-	}
-
-	export function setGenerator(file_type: string) {
+	export function setGenerator(file_type: string, version: string) {
 		dimension(DIM_GENERATOR, file_type)
 		gtag('event', 'use_generator', {
 			file_type,
+			version,
 		})
 	}
 
diff --git a/src/app/contexts/Locale.tsx b/src/app/contexts/Locale.tsx
index ad356451..806c37b0 100644
--- a/src/app/contexts/Locale.tsx
+++ b/src/app/contexts/Locale.tsx
@@ -69,6 +69,7 @@ export function LocaleProvider({ children }: { children: ComponentChildren }) {
 	useEffect(() => {
 		(async () => {
 			const target = Store.getLanguage()
+			Analytics.setLocale(target)
 			await Promise.all([
 				loadLocale('en'),
 				...(target !== 'en' ? [loadLocale(target)] : []),
diff --git a/src/app/contexts/Theme.tsx b/src/app/contexts/Theme.tsx
index df022f5f..bdc63421 100644
--- a/src/app/contexts/Theme.tsx
+++ b/src/app/contexts/Theme.tsx
@@ -39,6 +39,10 @@ export function ThemeProvider({ children }: { children: ComponentChildren }) {
 		Analytics.setPrefersColorScheme(prefersLight ? 'light' : prefersDark ? 'dark' : 'none')
 	}, [prefersLight, prefersDark])
 
+	useEffect(() => {
+		Analytics.setTheme(theme)
+	}, [])
+
 	const value: Theme = {
 		theme,
 		actualTheme: theme === 'light' || (theme !== 'dark' && prefersLight) ? 'light' : 'dark',
diff --git a/src/app/pages/Generator.tsx b/src/app/pages/Generator.tsx
index ce27f8d4..a9d904c2 100644
--- a/src/app/pages/Generator.tsx
+++ b/src/app/pages/Generator.tsx
@@ -100,7 +100,7 @@ export function Generator({}: Props) {
 			ignoreChange.current = true
 			model.reset(DataModel.wrapLists(data), false)
 		}
-		Analytics.setGenerator(gen.id)
+		Analytics.setGenerator(gen.id, version)
 		return { model, blockStates }
 	}, [gen.id, version, sharedSnippetId, currentPreset])