diff --git a/README.md b/README.md
index d59b1a5b..538302fd 100644
--- a/README.md
+++ b/README.md
@@ -20,11 +20,11 @@ You'll need to ensure you have the following installed on your local development
 ### Installation
 
 Install the Shopify CLI plugin:
+
 ```bash
 shopify plugins install plugin-theme-component
 ```
 
-
 ## List of commands
 
 <!-- commands -->
@@ -36,6 +36,8 @@ shopify plugins install plugin-theme-component
 * [`shopify theme component map THEMEDIR [COMPONENTSELECTOR]`](#shopify-theme-component-map-themedir-componentselector)
 * [`shopify theme generate import-map [THEMEDIR]`](#shopify-theme-generate-import-map-themedir)
 * [`shopify theme generate template-map [THEMEDIR]`](#shopify-theme-generate-template-map-themedir)
+* [`shopify theme locale clean [THEMEDIR]`](#shopify-theme-locale-clean-themedir)
+* [`shopify theme locale sync [THEMEDIR]`](#shopify-theme-locale-sync-themedir)
 
 ## `shopify theme component`
 
@@ -66,7 +68,7 @@ ARGUMENTS
   THEMEDIR  [default: .] path to theme directory
 
 FLAGS
-  -q, --[no-]quiet  suppress non-essential output
+  -q, --[no-]quiet  Suppress non-essential output
 
 DESCRIPTION
   Remove unused component files in a theme
@@ -89,8 +91,8 @@ ARGUMENTS
   THEMEDIR  path to theme directory
 
 FLAGS
-  -n, --collection-name=<value>     name of the component collection
-  -v, --collection-version=<value>  version of the component collection
+  -n, --collection-name=<value>     Name of the component collection
+  -v, --collection-version=<value>  Version of the component collection
 
 DESCRIPTION
   Copy files from a component collection into a theme
@@ -115,15 +117,15 @@ ARGUMENTS
   COMPONENTSELECTOR  [default: *] component name or names (comma-separated) or "*" for all components
 
 FLAGS
-  -i, --generate-import-map         generate import map
-  -m, --generate-template-map       generate template map
-  -n, --collection-name=<value>     name of the component collection
-  -s, --[no-]setup-files            copy setup files to theme directory
-  -t, --theme-dir=<value>           [default: https://github.com/archetype-themes/explorer] directory that contains
+  -i, --generate-import-map         Generate import map
+  -m, --generate-template-map       Generate template map
+  -n, --collection-name=<value>     Name of the component collection
+  -s, --[no-]setup-files            Copy setup files to theme directory
+  -t, --theme-dir=<value>           [default: https://github.com/archetype-themes/explorer] Directory that contains
                                     theme files for development
-  -v, --collection-version=<value>  version of the component collection
-  -w, --[no-]watch                  watch for changes in theme and component directories
-  -y, --[no-]preview                sync changes to theme directory
+  -v, --collection-version=<value>  Version of the component collection
+  -w, --[no-]watch                  Watch for changes in theme and component directories
+  -y, --[no-]preview                Sync changes to theme directory
       --environment=<value>         The environment to apply to the current command.
       --host=<value>                Set which network interface the web server listens on. The default value is
                                     127.0.0.1.
@@ -160,8 +162,8 @@ ARGUMENTS
   COMPONENTSELECTOR  [default: *] component name or names (comma-separated) or "*" for all components
 
 FLAGS
-  -n, --collection-name=<value>     name of the component collection
-  -v, --collection-version=<value>  version of the component collection
+  -n, --collection-name=<value>     Name of the component collection
+  -v, --collection-version=<value>  Version of the component collection
 
 DESCRIPTION
   Runs the map, copy, clean, and generate import-map commands in sequence
@@ -189,10 +191,10 @@ ARGUMENTS
   COMPONENTSELECTOR  [default: *] component name or names (comma-separated) or "*" for all components
 
 FLAGS
-  -f, --ignore-conflicts            ignore conflicts when mapping components
-  -n, --collection-name=<value>     name of the component collection
-  -o, --ignore-overrides            ignore overrides when mapping components
-  -v, --collection-version=<value>  version of the component collection
+  -f, --ignore-conflicts            Ignore conflicts when mapping components
+  -n, --collection-name=<value>     Name of the component collection
+  -o, --ignore-overrides            Ignore overrides when mapping components
+  -v, --collection-version=<value>  Version of the component collection
 
 DESCRIPTION
   Generates or updates a component.manifest.json file with the component collection details and a file map
@@ -219,7 +221,7 @@ ARGUMENTS
   THEMEDIR  [default: .] path to theme directory
 
 FLAGS
-  -q, --[no-]quiet  suppress non-essential output
+  -q, --[no-]quiet  Suppress non-essential output
 
 DESCRIPTION
   Generate an import map for JavaScript files in the assets directory
@@ -239,13 +241,96 @@ ARGUMENTS
   THEMEDIR  [default: .] path to theme directory
 
 FLAGS
-  -q, --[no-]quiet  suppress non-essential output
+  -q, --[no-]quiet  Suppress non-essential output
 
 DESCRIPTION
   Generate a template map for component routes in the templates directory
 ```
 
 _See code: [src/commands/theme/generate/template-map.ts](https://github.com/archetype-themes/plugin-theme-component/blob/v5.0.8/src/commands/theme/generate/template-map.ts)_
+
+## `shopify theme locale clean [THEMEDIR]`
+
+Remove unreferenced translations from theme locale files
+
+```
+USAGE
+  $ shopify theme locale clean [THEMEDIR] [--format] [--target all|schema|storefront]
+
+ARGUMENTS
+  THEMEDIR  [default: .] path to theme directory
+
+FLAGS
+  --format           Format locale files by sorting keys alphabetically
+  --target=<option>  [default: all] Target locale files to process:
+                     - all: Process all locale files
+                     - schema: Process only schema translations (*.schema.json)
+                     - storefront: Process only storefront translations
+                     <options: all|schema|storefront>
+
+DESCRIPTION
+  Remove unreferenced translations from theme locale files
+
+EXAMPLES
+  $ shopify theme locale clean theme-directory
+
+  $ shopify theme locale clean theme-directory --target=schema
+
+  $ shopify theme locale clean theme-directory --target=storefront
+```
+
+_See code: [src/commands/theme/locale/clean.ts](https://github.com/archetype-themes/plugin-theme-component/blob/v5.0.8/src/commands/theme/locale/clean.ts)_
+
+## `shopify theme locale sync [THEMEDIR]`
+
+Sync theme locale files with source translations
+
+```
+USAGE
+  $ shopify theme locale sync [THEMEDIR] [-c] [--format] [-l <value>] [-m
+    add-missing|add-and-override|replace-existing] [--target all|schema|storefront]
+
+ARGUMENTS
+  THEMEDIR  [default: .] path to theme directory
+
+FLAGS
+  -c, --clean
+      Remove unreferenced translations from theme locale files
+
+  -l, --locales-source=<value>
+      [default: https://github.com/archetype-themes/locales] Directory that contains a "locales" folder with locale files
+
+  -m, --mode=<option>
+      [default: add-missing] Sync mode for locale files (only translations used in the theme will be processed):
+      - add-missing: Only add new translations that do not exist in theme locale files
+      - add-and-override: Add new translations and override existing ones with source values
+      - replace-existing: Replace values of existing translations with source values
+      <options: add-missing|add-and-override|replace-existing>
+
+  --format
+      Format locale files by sorting keys alphabetically
+
+  --target=<option>
+      [default: all] Target locale files to process:
+      - all: Process all locale files
+      - schema: Process only schema translations (*.schema.json)
+      - storefront: Process only storefront translations
+      <options: all|schema|storefront>
+
+DESCRIPTION
+  Sync theme locale files with source translations
+
+EXAMPLES
+  $ shopify theme locale sync theme-directory
+
+  $ shopify theme locale sync theme-directory --clean
+
+  $ shopify theme locale sync theme-directory --clean --target=schema
+
+  $ shopify theme locale sync theme-directory --locales-source=path/to/directory
+```
+
+_See code: [src/commands/theme/locale/sync.ts](https://github.com/archetype-themes/plugin-theme-component/blob/v5.0.8/src/commands/theme/locale/sync.ts)_
 <!-- commandsstop -->
 
 ## Contributing
@@ -259,6 +344,7 @@ If you notice a bug, or want to contribute to the codebase, feel free to do so i
 If you already have the plugin installed via npm, you'll need to [uninstall](#uninstalling-the-plugin) the plugin before being able to develop the plugin locally.
 
 Once this is done, follow these steps to ensure the Shopify CLI is running the local version of the plugin:
+
 - `git clone https://github.com/archetype-themes/plugin-theme-component.git`
 - `cd plugin-theme-component`
 - `npm i`
diff --git a/src/commands/theme/component/clean.ts b/src/commands/theme/component/clean.ts
index b1e9117e..5477fda2 100644
--- a/src/commands/theme/component/clean.ts
+++ b/src/commands/theme/component/clean.ts
@@ -1,6 +1,6 @@
 /**
  * This command cleans up component files in a theme directory.
- * 
+ *
  * - Removes component files (snippets and assets) that are not listed in the component map
  * - Ensures the theme directory only contains necessary component files
  */
@@ -8,7 +8,7 @@
 import fs from 'node:fs'
 import path from 'node:path'
 
-import Args from '../../../utilities/args.js'    
+import Args from '../../../utilities/args.js'
 import BaseCommand from '../../../utilities/base-command.js'
 import { getManifest } from '../../../utilities/manifest.js'
 import { getThemeNodes } from '../../../utilities/nodes.js'
@@ -30,7 +30,7 @@ export default class Clean extends BaseCommand {
 
   public async run(): Promise<void> {
     const themeDir = path.resolve(process.cwd(), this.args[Args.THEME_DIR])
-    
+
     const manifest = getManifest(path.join(themeDir, 'component.manifest.json'))
     const themeNodes = await getThemeNodes(themeDir)
 
diff --git a/src/commands/theme/component/copy.ts b/src/commands/theme/component/copy.ts
index d3971869..757bcaca 100644
--- a/src/commands/theme/component/copy.ts
+++ b/src/commands/theme/component/copy.ts
@@ -1,6 +1,6 @@
 /**
  * This command copies component files into a theme directory.
- * 
+ *
  * - Copies rendered component files (snippets and assets) into the theme directory
  * - Updates the theme CLI config (shopify.theme.json) with the component collection details
  */
@@ -8,13 +8,13 @@
 import fs from 'node:fs'
 import path from 'node:path'
 
-import Args from '../../../utilities/args.js'    
+import Args from '../../../utilities/args.js'
 import BaseCommand from '../../../utilities/base-command.js'
 import { copyFileIfChanged } from '../../../utilities/files.js';
 import Flags from '../../../utilities/flags.js'
 import { getManifest } from '../../../utilities/manifest.js'
 import { getCollectionNodes } from '../../../utilities/nodes.js'
-import { getNameFromPackageJson , getVersionFromPackageJson } from '../../../utilities/package-json.js'
+import { getNameFromPackageJson, getVersionFromPackageJson } from '../../../utilities/package-json.js'
 
 export default class Copy extends BaseCommand {
   static override args = Args.getDefinitions([
@@ -52,7 +52,7 @@ export default class Copy extends BaseCommand {
     if (!fs.existsSync(path.join(themeDir, 'component.manifest.json'))) {
       this.error('Error: component.manifest.json file not found in the theme directory. Run "shopify theme component map" to generate a component.manifest.json file.');
     }
-    
+
     const manifest = getManifest(path.join(themeDir, 'component.manifest.json'))
     const componentNodes = await getCollectionNodes(currentDir)
 
diff --git a/src/commands/theme/component/dev.ts b/src/commands/theme/component/dev.ts
index 9da3cecd..73b35464 100644
--- a/src/commands/theme/component/dev.ts
+++ b/src/commands/theme/component/dev.ts
@@ -1,18 +1,17 @@
 /**
  * This command sets up a sandboxed development environment for components.
- * 
+ *
  * - Removes any existing development directory
  * - Copies dev theme files and rendered component files into a temporary development directory
  * - Watches for changes to synchronize updates
  * - Runs 'shopify theme dev' on the temporary development directory to preview your work
  */
 
-
 import chokidar from 'chokidar'
 import path from 'node:path'
 import { URL } from 'node:url'
 
-import Args from '../../../utilities/args.js'    
+import Args from '../../../utilities/args.js'
 import BaseCommand from '../../../utilities/base-command.js'
 import { cleanDir, syncFiles } from '../../../utilities/files.js'
 import Flags from '../../../utilities/flags.js'
@@ -82,14 +81,14 @@ export default class Dev extends BaseCommand {
     const themeDir = await this.getThemeDirectory(devDir)
 
     this.log(`Building theme in ${devDir}...`)
-    
+
     const buildThemeParams: BuildThemeParams = {
       componentSelector,
       generateTemplateMap,
       setupFiles,
       themeDir
     }
-    
+
     await this.buildTheme(devDir, buildThemeParams)
 
     // Run shopify theme dev if preview is enabled
@@ -111,12 +110,12 @@ export default class Dev extends BaseCommand {
     // Copy the component setup files if needed
     if (params.setupFiles) {
       await copySetupComponentFiles(
-        process.cwd(), 
-        destination, 
+        process.cwd(),
+        destination,
         params.componentSelector
       )
     }
-    
+
     // Install the components
     await Install.run([destination])
 
@@ -154,24 +153,24 @@ export default class Dev extends BaseCommand {
   private async getThemeDirectory(devDir: string): Promise<string> {
     if (this.flags[Flags.THEME_DIR].startsWith('http')) {
       const url = new URL(this.flags[Flags.THEME_DIR])
-      const {host} = url
-      
+      const { host } = url
+
       if (host === 'github.com' || host.endsWith('.github.com')) {
         const themeDir = path.join(devDir, '.repo')
         this.log(`Cloning theme from ${this.flags[Flags.THEME_DIR]} into dev directory ${devDir}`)
         await cloneTheme(this.flags[Flags.THEME_DIR], themeDir)
         return themeDir
       }
-      
+
       throw new Error(`Unsupported theme URL: ${this.flags[Flags.THEME_DIR]}`)
     }
-    
+
     return path.resolve(process.cwd(), this.flags[Flags.THEME_DIR])
   }
 
   private setupWatcher(devDir: string, themeDir: string, componentsDir: string, buildThemeParams: BuildThemeParams): Promise<void> {
     const watchDir = path.join(devDir, '.watch')
-    
+
     // Need to access chokidar as a default import so it can be mocked in tests
     // eslint-disable-next-line import/no-named-as-default-member
     const themeWatcher = chokidar.watch([themeDir, componentsDir], {
diff --git a/src/commands/theme/component/index.ts b/src/commands/theme/component/index.ts
index 4555bbea..7e7a7e19 100644
--- a/src/commands/theme/component/index.ts
+++ b/src/commands/theme/component/index.ts
@@ -22,8 +22,8 @@ export default class Component extends Command {
     } else {
       this.log(
         '\nWelcome To The Theme Component Plugin by Archetype Themes.' +
-          '\n\nUse the "--help" or "-h" flag to list available commands'
+        '\n\nUse the "--help" or "-h" flag to list available commands'
       )
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/commands/theme/component/install.ts b/src/commands/theme/component/install.ts
index 3d1106f7..4894a8f2 100644
--- a/src/commands/theme/component/install.ts
+++ b/src/commands/theme/component/install.ts
@@ -1,13 +1,13 @@
 /**
  * This command installs component files into a theme directory.
- * 
+ *
  * - Maps the components in the theme directory
  * - Copies rendered component files (snippets and assets) into the theme directory
  * - Cleans up unnecessary component files in the theme directory
  * - Generates an import-map.liquid snippet file based on JS assets
  */
 
-import Args from '../../../utilities/args.js'    
+import Args from '../../../utilities/args.js'
 import BaseCommand from '../../../utilities/base-command.js'
 import Flags from '../../../utilities/flags.js'
 import GenerateImportMap from '../generate/import-map.js'
@@ -44,4 +44,4 @@ export default class Install extends BaseCommand {
     await Clean.run([this.args[Args.THEME_DIR]!])
     await GenerateImportMap.run([this.args[Args.THEME_DIR]!, '--quiet'])
   }
-}
\ No newline at end of file
+}
diff --git a/src/commands/theme/component/map.ts b/src/commands/theme/component/map.ts
index bde02f5a..51948b87 100644
--- a/src/commands/theme/component/map.ts
+++ b/src/commands/theme/component/map.ts
@@ -1,6 +1,6 @@
 /**
  * This command generates or updates a component.manifest.json file
- * 
+ *
  * - Updates component files (assets and snippets) mapping
  * - Updates component collection details
  */
@@ -8,11 +8,12 @@
 import fs from 'node:fs'
 import path from 'node:path'
 
-import Args from '../../../utilities/args.js'    
+import Args from '../../../utilities/args.js'
 import BaseCommand from '../../../utilities/base-command.js'
 import Flags from '../../../utilities/flags.js'
 import { getLastCommitHash } from '../../../utilities/git.js'
 import { ManifestOptions, generateManifestFiles, getManifest } from '../../../utilities/manifest.js'
+import { sortObjectKeys } from '../../../utilities/objects.js'
 import { getNameFromPackageJson, getVersionFromPackageJson } from '../../../utilities/package-json.js'
 
 export default class Manifest extends BaseCommand {
@@ -67,9 +68,9 @@ export default class Manifest extends BaseCommand {
     }
 
     const files = await generateManifestFiles(
-      manifest.files, 
-      themeDir, 
-      collectionDir, 
+      manifest.files,
+      themeDir,
+      collectionDir,
       collectionName,
       options
     )
@@ -83,21 +84,3 @@ export default class Manifest extends BaseCommand {
     fs.writeFileSync(manifestPath, JSON.stringify(sortObjectKeys(manifest), null, 2))
   }
 }
-
-function sortObjectKeys<T>(obj: T): T {
-  if (Array.isArray(obj)) {
-    return obj.map((item) => sortObjectKeys(item)) as T;
-  }
-
-  if (obj !== null && typeof obj === 'object') {
-    const sortedObj: Record<string, unknown> = {};
-    const sortedKeys = Object.keys(obj as object).sort();
-    for (const key of sortedKeys) {
-      sortedObj[key] = sortObjectKeys((obj as Record<string, unknown>)[key]);
-    }
-    
-    return sortedObj as T;
-  }
-
-  return obj;
-}
diff --git a/src/commands/theme/generate/import-map.ts b/src/commands/theme/generate/import-map.ts
index a59a454b..ecc4674f 100644
--- a/src/commands/theme/generate/import-map.ts
+++ b/src/commands/theme/generate/import-map.ts
@@ -1,3 +1,11 @@
+/**
+ * This command generates an import map for JavaScript files in the assets directory.
+ *
+ * - Reads all JS files in the assets directory
+ * - Creates an import map object with the asset URLs
+ * - Writes the import map to snippets/import-map.liquid
+ */
+
 import * as fs from 'node:fs'
 import * as path from 'node:path'
 
@@ -15,7 +23,7 @@ export default class GenerateImportMap extends BaseCommand {
     const themeDir = path.resolve(process.cwd(), this.args[Args.THEME_DIR])
     const assetsDir = path.join(themeDir, 'assets')
     const snippetsDir = path.join(themeDir, 'snippets')
-    
+
     // Check if assets directory exists
     if (!fs.existsSync(assetsDir)) {
       this.error(`Assets directory not found. Please ensure ${themeDir} is a theme directory.`)
diff --git a/src/commands/theme/generate/template-map.ts b/src/commands/theme/generate/template-map.ts
index 9c99abec..b2c842bf 100644
--- a/src/commands/theme/generate/template-map.ts
+++ b/src/commands/theme/generate/template-map.ts
@@ -1,3 +1,11 @@
+/**
+ * This command generates a template map for component routes in the templates directory.
+ *
+ * - Reads all liquid files in the templates directory recursively
+ * - Creates a template map object with the component name and route template
+ * - Writes the template map to snippets/template-map.liquid
+ */
+
 import * as fs from 'node:fs'
 import * as path from 'node:path'
 
@@ -16,7 +24,7 @@ export default class GenerateTemplateMap extends BaseCommand {
     const themeDir = path.resolve(process.cwd(), this.args[Args.THEME_DIR])
     const templatesDir = path.join(themeDir, 'templates')
     const snippetsDir = path.join(themeDir, 'snippets')
-    
+
     // Check if directories exist
     if (!fs.existsSync(templatesDir)) {
       this.error('Templates directory not found. Please ensure you are in a theme directory.')
@@ -30,7 +38,7 @@ export default class GenerateTemplateMap extends BaseCommand {
     const getFiles = (dir: string): string[] => {
       const files = fs.readdirSync(dir)
       const result: string[] = [];
-      
+
       for (const file of files) {
         const filePath = path.join(dir, file)
         if (fs.statSync(filePath).isDirectory()) {
@@ -42,7 +50,7 @@ export default class GenerateTemplateMap extends BaseCommand {
           result.push(filePath);
         }
       }
-      
+
       return result;
     }
 
@@ -65,11 +73,11 @@ export default class GenerateTemplateMap extends BaseCommand {
 
     // Merge entries with the same component name
     const mergedTemplateMap: Record<string, Record<string, string>> = {};
-    
+
     for (const [component, routes] of Object.entries(templateMap)) {
       if (typeof routes === 'object' && routes !== null) {
-        mergedTemplateMap[component] = mergedTemplateMap[component] 
-          ? { ...mergedTemplateMap[component], ...routes } 
+        mergedTemplateMap[component] = mergedTemplateMap[component]
+          ? { ...mergedTemplateMap[component], ...routes }
           : routes;
       }
     }
@@ -185,4 +193,3 @@ export default class GenerateTemplateMap extends BaseCommand {
     }
   }
 }
-
diff --git a/src/commands/theme/locale/clean.ts b/src/commands/theme/locale/clean.ts
new file mode 100644
index 00000000..15aa98bb
--- /dev/null
+++ b/src/commands/theme/locale/clean.ts
@@ -0,0 +1,50 @@
+/**
+ * This command cleans up locale files in a theme directory.
+ *
+ * - Scans theme files for translation keys
+ * - Removes unreferenced translations from locale files
+ */
+
+import path from 'node:path'
+
+import Args from '../../../utilities/args.js'
+import BaseCommand from '../../../utilities/base-command.js'
+import Flags from '../../../utilities/flags.js'
+import { removeUnreferencedTranslationsFromTheme } from '../../../utilities/locales.js'
+import { CleanOptions, CleanTarget } from '../../../utilities/types.js'
+
+export default class Clean extends BaseCommand {
+  static override args = Args.getDefinitions([
+    Args.override(Args.THEME_DIR, { default: '.', required: false })
+  ])
+
+  static override description = 'Remove unreferenced translations from theme locale files'
+
+  static override examples = [
+    '<%= config.bin %> <%= command.id %> theme-directory',
+    '<%= config.bin %> <%= command.id %> theme-directory --target=schema',
+    '<%= config.bin %> <%= command.id %> theme-directory --target=storefront'
+  ]
+
+  static override flags = Flags.getDefinitions([
+    Flags.FORMAT,
+    Flags.TARGET
+  ])
+
+  protected override async init(): Promise<void> {
+    await super.init(Clean)
+  }
+
+  public async run(): Promise<void> {
+    const themeDir = path.resolve(process.cwd(), this.args[Args.THEME_DIR])
+    const target = this.flags[Flags.TARGET] as CleanTarget
+    const format = this.flags[Flags.FORMAT]
+
+    const options: CleanOptions = { format, target }
+    await removeUnreferencedTranslationsFromTheme(themeDir, options)
+
+    if (!this.flags[Flags.QUIET]) {
+      this.log('Successfully removed unreferenced translations from locale files')
+    }
+  }
+}
diff --git a/src/commands/theme/locale/sync.ts b/src/commands/theme/locale/sync.ts
new file mode 100644
index 00000000..67dcb7da
--- /dev/null
+++ b/src/commands/theme/locale/sync.ts
@@ -0,0 +1,73 @@
+/**
+ * This command syncs locale files in a theme directory with a source of translations.
+ *
+ * - Fetches translations from source (remote or local)
+ * - Updates theme locale files based on selected mode
+ * - Preserves file structure and formatting
+ */
+
+import path from 'node:path'
+
+import Args from '../../../utilities/args.js'
+import BaseCommand from '../../../utilities/base-command.js'
+import Flags from '../../../utilities/flags.js'
+import { filterSourceTranslationsToKeysUsedInTheme, findTranslationKeysUsedInTheme, getLocalesSource, mergeLocaleFiles, removeUnreferencedTranslationsFromTheme } from '../../../utilities/locales.js'
+import { CleanOptions, CleanTarget, SyncOptions, TranslationKeysUsedInTheme } from '../../../utilities/types.js'
+
+export default class Sync extends BaseCommand {
+  static override args = Args.getDefinitions([
+    Args.override(Args.THEME_DIR, { default: '.', required: false })
+  ])
+
+  static override description = 'Sync theme locale files with source translations'
+
+  static override examples = [
+    '<%= config.bin %> <%= command.id %> theme-directory',
+    '<%= config.bin %> <%= command.id %> theme-directory --clean',
+    '<%= config.bin %> <%= command.id %> theme-directory --clean --target=schema',
+    '<%= config.bin %> <%= command.id %> theme-directory --locales-source=path/to/directory'
+  ]
+
+  static override flags = Flags.getDefinitions([
+    Flags.CLEAN,
+    Flags.FORMAT,
+    Flags.LOCALES_SOURCE,
+    Flags.MODE,
+    Flags.TARGET
+  ])
+
+  public async run(): Promise<void> {
+    const themeDir = path.resolve(process.cwd(), this.args[Args.THEME_DIR])
+    const localesSource = this.flags[Flags.LOCALES_SOURCE]
+    const target = this.flags[Flags.TARGET] as CleanTarget
+    const format = this.flags[Flags.FORMAT]
+
+    const translations = findTranslationKeysUsedInTheme(themeDir)
+    const localesContent = await getLocalesSource(localesSource)
+    await this.mergeTranslationsWithTheme(themeDir, translations, localesContent)
+
+    if (this.flags[Flags.CLEAN]) {
+      const options: CleanOptions = { format, target }
+      await removeUnreferencedTranslationsFromTheme(themeDir, options)
+    }
+  }
+
+  private async mergeTranslationsWithTheme(
+    themeDir: string,
+    translations: TranslationKeysUsedInTheme,
+    localesContent: Record<string, Record<string, unknown>>
+  ): Promise<void> {
+    const options: SyncOptions = {
+      format: this.flags[Flags.FORMAT],
+      mode: this.flags[Flags.MODE],
+      target: this.flags[Flags.TARGET] as CleanTarget
+    }
+
+    const filteredLocalesContent = filterSourceTranslationsToKeysUsedInTheme(localesContent, translations)
+    await mergeLocaleFiles(themeDir, filteredLocalesContent, options)
+
+    if (!this.flags[Flags.QUIET]) {
+      this.log('Successfully synced locale files')
+    }
+  }
+}
diff --git a/src/utilities/files.ts b/src/utilities/files.ts
index a5b77be9..a043ba97 100644
--- a/src/utilities/files.ts
+++ b/src/utilities/files.ts
@@ -3,6 +3,7 @@ import fs from 'fs-extra';
 import path from 'node:path'
 
 import logger from './logger.js'
+import { sortObjectKeys } from './objects.js'
 
 export function syncFiles(srcDir: string, destDir: string) {
   if (!fs.existsSync(srcDir)) {
@@ -32,7 +33,7 @@ export function syncFiles(srcDir: string, destDir: string) {
         }
       }
     }
-    
+
     // Copy each file/directory from source
     for (const file of srcFiles) {
       if (file.startsWith('.')) continue;
@@ -84,9 +85,24 @@ export function writeFileIfChanged(content: string, dest: string) {
   }
 }
 
+export function writeJsonFile(
+  filePath: string,
+  content: Record<string, unknown>,
+  options?: { format?: boolean }
+): void {
+  const formattedContent = options?.format ? sortObjectKeys(content) : content
+  const dirPath = path.dirname(filePath)
+
+  if (!fs.existsSync(dirPath)) {
+    fs.mkdirSync(dirPath, { recursive: true })
+  }
+
+  fs.writeFileSync(filePath, JSON.stringify(formattedContent, null, 2) + '\n')
+}
+
 export function cleanDir(dir: string) {
   if (fs.existsSync(dir)) {
-    fs.rmSync(dir, {recursive: true})
+    fs.rmSync(dir, { recursive: true })
   }
 
   fs.mkdirSync(dir)
diff --git a/src/utilities/flags.ts b/src/utilities/flags.ts
index bf5d7d13..b1a5857d 100644
--- a/src/utilities/flags.ts
+++ b/src/utilities/flags.ts
@@ -1,4 +1,4 @@
-import {Flags as OclifFlags} from '@oclif/core'
+import { Flags as OclifFlags } from '@oclif/core'
 import { FlagInput } from '@oclif/core/interfaces';
 
 import { ComponentConfig } from './types.js'
@@ -10,12 +10,15 @@ export default class Flags {
   static readonly COLLECTION_PACKAGE_JSON = 'collection-package-json';
   static readonly COLLECTION_VERSION = 'collection-version';
   static readonly ENVIRONMENT = 'environment';
+  static readonly FORMAT = 'format';
   static readonly GENERATE_IMPORT_MAP = 'generate-import-map';
   static readonly GENERATE_TEMPLATE_MAP = 'generate-template-map';
   static readonly HOST = 'host';
   static readonly IGNORE_CONFLICTS = 'ignore-conflicts';
   static readonly IGNORE_OVERRIDES = 'ignore-overrides';
   static readonly LIVE_RELOAD = 'live-reload';
+  static readonly LOCALES_SOURCE = 'locales-source';
+  static readonly MODE = 'mode';
   static readonly PASSWORD = 'password';
   static readonly PORT = 'port';
   static readonly PREVIEW = 'preview';
@@ -23,10 +26,11 @@ export default class Flags {
   static readonly SETUP_FILES = 'setup-files';
   static readonly STORE = 'store';
   static readonly STORE_PASSWORD = 'store-password';
+  static readonly TARGET = 'target';
   static readonly THEME = 'theme';
   static readonly THEME_DIR = 'theme-dir';
   static readonly WATCH = 'watch';
-  
+
   private flagValues: Record<string, FlagInput<object>>;
   constructor(flags: Record<string, FlagInput<object>>) {
     this.flagValues = flags
@@ -47,34 +51,40 @@ export default class Flags {
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const flagDefinitions: Record<string, any> = {
   [Flags.CLEAN]: OclifFlags.boolean({
+    char: 'c',
     default: false,
-    description: 'Clean the theme directory before copying components'
+    description: 'Remove unreferenced translations from theme locale files'
   }),
 
   [Flags.COLLECTION_NAME]: OclifFlags.string({
     char: 'n',
-    description: 'name of the component collection',
+    description: 'Name of the component collection',
   }),
 
   [Flags.COLLECTION_VERSION]: OclifFlags.string({
     char: 'v',
-    description: 'version of the component collection',
+    description: 'Version of the component collection',
   }),
 
   [Flags.ENVIRONMENT]: OclifFlags.string({
     description: 'The environment to apply to the current command.',
   }),
 
+  [Flags.FORMAT]: OclifFlags.boolean({
+    default: false,
+    description: 'Format locale files by sorting keys alphabetically',
+  }),
+
   [Flags.GENERATE_IMPORT_MAP]: OclifFlags.boolean({
     char: 'i',
     default: true,
-    description: 'generate import map',
+    description: 'Generate import map',
   }),
 
   [Flags.GENERATE_TEMPLATE_MAP]: OclifFlags.boolean({
     char: 'm',
     default: true,
-    description: 'generate template map',
+    description: 'Generate template map',
   }),
 
   [Flags.HOST]: OclifFlags.string({
@@ -84,19 +94,35 @@ export const flagDefinitions: Record<string, any> = {
   [Flags.IGNORE_CONFLICTS]: OclifFlags.boolean({
     char: 'f',
     default: false,
-    description: 'ignore conflicts when mapping components',
+    description: 'Ignore conflicts when mapping components',
   }),
 
   [Flags.IGNORE_OVERRIDES]: OclifFlags.boolean({
     char: 'o',
     default: false,
-    description: 'ignore overrides when mapping components',
+    description: 'Ignore overrides when mapping components',
   }),
 
   [Flags.LIVE_RELOAD]: OclifFlags.boolean({
     description: 'Reload the browser when changes are made.',
   }),
 
+  [Flags.LOCALES_SOURCE]: OclifFlags.string({
+    char: 'l',
+    default: 'https://github.com/archetype-themes/locales',
+    description: 'Directory that contains a "locales" folder with locale files',
+  }),
+
+  [Flags.MODE]: OclifFlags.string({
+    char: 'm',
+    default: 'add-missing',
+    description: 'Sync mode for locale files (only translations used in the theme will be processed):\n' +
+      '- add-missing: Only add new translations that do not exist in theme locale files\n' +
+      '- add-and-override: Add new translations and override existing ones with source values\n' +
+      '- replace-existing: Replace values of existing translations with source values',
+    options: ['add-missing', 'add-and-override', 'replace-existing']
+  }),
+
   [Flags.PASSWORD]: OclifFlags.string({
     description: 'Password generated from the Theme Access app.',
   }),
@@ -109,21 +135,21 @@ export const flagDefinitions: Record<string, any> = {
     allowNo: true,
     char: 'y',
     default: true,
-    description: 'sync changes to theme directory',
+    description: 'Sync changes to theme directory',
   }),
 
   [Flags.QUIET]: OclifFlags.boolean({
     allowNo: true,
     char: 'q',
     default: false,
-    description: 'suppress non-essential output'
+    description: 'Suppress non-essential output'
   }),
 
   [Flags.SETUP_FILES]: OclifFlags.boolean({
     allowNo: true,
     char: 's',
     default: true,
-    description: 'copy setup files to theme directory',
+    description: 'Copy setup files to theme directory',
   }),
 
   [Flags.STORE]: OclifFlags.string({
@@ -134,6 +160,15 @@ export const flagDefinitions: Record<string, any> = {
     description: 'The password for storefronts with password protection.',
   }),
 
+  [Flags.TARGET]: OclifFlags.string({
+    default: 'all',
+    description: 'Target locale files to process:\n' +
+      '- all: Process all locale files\n' +
+      '- schema: Process only schema translations (*.schema.json)\n' +
+      '- storefront: Process only storefront translations',
+    options: ['all', 'schema', 'storefront']
+  }),
+
   [Flags.THEME]: OclifFlags.string({
     description: 'Theme ID or name of the remote theme.',
   }),
@@ -141,13 +176,13 @@ export const flagDefinitions: Record<string, any> = {
   [Flags.THEME_DIR]: OclifFlags.string({
     char: 't',
     default: 'https://github.com/archetype-themes/explorer',
-    description: 'directory that contains theme files for development',
+    description: 'Directory that contains theme files for development',
   }),
 
   [Flags.WATCH]: OclifFlags.boolean({
     allowNo: true,
     char: 'w',
     default: true,
-    description: 'watch for changes in theme and component directories',
+    description: 'Watch for changes in theme and component directories',
   }),
 }
diff --git a/src/utilities/git.ts b/src/utilities/git.ts
index 7cbb362b..44136875 100644
--- a/src/utilities/git.ts
+++ b/src/utilities/git.ts
@@ -1,4 +1,4 @@
-import {execSync} from 'node:child_process'
+import { execSync } from 'node:child_process'
 import path from 'node:path'
 
 export async function cloneTheme(repoUrl: string, targetDir: string): Promise<void> {
@@ -21,4 +21,4 @@ export function getLastCommitHash(directory: string): null | string {
   } catch {
     return null
   }
-} 
\ No newline at end of file
+}
diff --git a/src/utilities/locales.ts b/src/utilities/locales.ts
new file mode 100644
index 00000000..aa8c294c
--- /dev/null
+++ b/src/utilities/locales.ts
@@ -0,0 +1,454 @@
+import fs, { mkdtempSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import path from 'node:path'
+
+import { writeJsonFile } from './files.js'
+import { cloneTheme } from './git.js'
+import { flattenObject, unflattenObject } from './objects.js'
+import { CleanOptions, LocaleContent, LocaleDiff, LocaleOptions, SyncOptions, TranslationKeysUsedInTheme } from './types.js'
+
+const SCHEMA_DIRS = ['config', 'blocks', 'sections'] as const
+const STOREFRONT_DIRS = ['blocks', 'layout', 'sections', 'snippets', 'templates'] as const
+
+export async function getLocalesSource(source: string): Promise<LocaleContent> {
+  if (isUrl(source)) {
+    return fetchRemoteLocales(source)
+  }
+
+  return loadLocalLocales(source)
+}
+
+function isUrl(source: string): boolean {
+  return source.startsWith('http://') || source.startsWith('https://')
+}
+
+async function fetchRemoteLocales(url: string): Promise<LocaleContent> {
+  const tempDir = mkdtempSync(path.join(tmpdir(), 'theme-locales-'))
+
+  try {
+    await cloneTheme(url, tempDir)
+    return loadLocalLocales(path.join(tempDir, 'locales'))
+  } finally {
+    rmSync(tempDir, { force: true, recursive: true })
+  }
+}
+
+function loadLocalLocales(dir: string): LocaleContent {
+  if (!fs.existsSync(dir)) {
+    throw new Error(`Directory does not exist: ${dir}`)
+  }
+
+  const content: LocaleContent = {}
+  const files = fs.readdirSync(dir).filter(file => file.endsWith('.json'))
+
+  for (const file of files) {
+    const filePath = path.join(dir, file)
+
+    try {
+      content[file] = JSON.parse(fs.readFileSync(filePath, 'utf8'))
+    } catch (error) {
+      throw new Error(`Failed to parse JSON file ${file}: ${error instanceof Error ? error.message : String(error)}`)
+    }
+  }
+
+  return content
+}
+
+export function findTranslationKeysUsedInTheme(themeDir: string): TranslationKeysUsedInTheme {
+  return {
+    schema: findKeysInThemeFiles(themeDir, SCHEMA_DIRS, extractSchemaTranslationKeys),
+    storefront: findKeysInThemeFiles(themeDir, STOREFRONT_DIRS, extractStorefrontTranslationKeys)
+  }
+}
+
+function findKeysInThemeFiles(themeDir: string, dirs: readonly string[], findKeys: (content: string) => Set<string>): Set<string> {
+  const usedKeys = new Set<string>()
+
+  for (const dir of dirs) {
+    const dirPath = path.join(themeDir, dir)
+    if (!fs.existsSync(dirPath)) continue
+
+    const files = fs.readdirSync(dirPath)
+      .filter(file => file.endsWith('.liquid') || file.endsWith('.json'))
+
+    for (const file of files) {
+      const filePath = path.join(dirPath, file)
+      const content = fs.readFileSync(filePath, 'utf8')
+      const keys = findKeys(content)
+      for (const key of keys) {
+        usedKeys.add(key)
+      }
+    }
+  }
+
+  return usedKeys
+}
+
+function extractSchemaTranslationKeys(content: string): Set<string> {
+  const keys = new Set<string>()
+  const matches = content.match(/"t:([^"]+)"/g) || []
+
+  for (const match of matches) {
+    const keyMatch = match.match(/"t:([^"]+)"/)
+    if (keyMatch && keyMatch[1]) {
+      keys.add(keyMatch[1])
+    }
+  }
+
+  return keys
+}
+
+function extractDynamicTranslationPrefixes(keys: Set<string>): Set<string> {
+  const prefixKeys = new Set<string>()
+  for (const key of keys) {
+    if (key.endsWith('.')) {
+      prefixKeys.add(key)
+    }
+  }
+
+  return prefixKeys
+}
+
+function extractStorefrontTranslationKeys(content: string): Set<string> {
+  const keys = new Set<string>()
+
+  // Standard Liquid translation patterns
+  const standardPatterns = [
+    /{{\s*-?\s*["']([^"']+)["']\s*\|\s*t[^}]*-?\s*}}/g,
+    /{%\s*(?:assign|capture)\s+\w+\s*=\s*["']([^"']+)["']\s*\|\s*t[^%]*%}/g,
+    /(?:^|\s)["']([^"']+)["']\s*\|\s*t[^\n}]*/gm,
+  ]
+
+  // Find standard translations
+  for (const pattern of standardPatterns) {
+    const matches = content.match(pattern) || []
+    for (const match of matches) {
+      const keyMatch = match.match(/["']([^"']+)["']/)
+      if (keyMatch && keyMatch[1]) {
+        keys.add(keyMatch[1])
+      }
+    }
+  }
+
+  // Find dynamic translation keys (any string ending with a dot followed by t filter)
+  // This captures patterns like:
+  // - 'prefix.' | append: x | t
+  // - 'prefix.' | append: x | replace: '-', '_' | t
+  // - assign tag_text = 'tags.' | append: tag_id | t
+  // - {% assign tag_text = 'tags.' | append: tag_id | t %}
+  // - {{ 'prefix.' | append: x | t }}
+  const dynamicPattern = /["']([^"']*\.)["'](?:[^|]*\|)+(?:[^t|]*\|)?\s*t(?::[^%}]*)?[%}]?/g;
+
+  const matches = content.match(dynamicPattern) || [];
+  for (const match of matches) {
+    const keyMatch = match.match(/["']([^"']*\.)["']/);
+    if (keyMatch && keyMatch[1]) {
+      const key = keyMatch[1];
+      keys.add(key);
+    }
+  }
+
+  // Combine with t_with_fallback translations
+  return new Set([...keys, ...extractTWithFallbackTranslationKeys(content)])
+}
+
+function extractTWithFallbackTranslationKeys(content: string): Set<string> {
+  // Find translations assigned to variables first
+  const assignedTranslations = findTranslationVariables(content)
+
+  // Find both direct keys and variable-based keys
+  const directKeys = extractDirectTWithFallbackTranslationKeys(content)
+  const variableKeys = extractVariableTWithFallbackTranslationKeys(content, assignedTranslations)
+
+  return new Set([...directKeys, ...variableKeys])
+}
+
+function findTranslationVariables(content: string): Map<string, string> {
+  const assignments = new Map<string, string>()
+  const pattern = /{%-?\s*assign\s+([^\s=]+)\s*=\s*["']([^"']+)["']\s*\|\s*t[^%]*-?%}/g
+
+  const matches = [...content.matchAll(pattern)]
+  for (const match of matches) {
+    const [, varName, translationKey] = match
+    assignments.set(varName, translationKey)
+  }
+
+  return assignments
+}
+
+function extractDirectTWithFallbackTranslationKeys(content: string): Set<string> {
+  const keys = new Set<string>()
+  const pattern = /render\s+["']t_with_fallback["'][^%]*key:\s*["']([^"']+)["']/g
+
+  const matches = [...content.matchAll(pattern)]
+  for (const match of matches) {
+    keys.add(match[1])
+  }
+
+  return keys
+}
+
+function extractVariableTWithFallbackTranslationKeys(content: string, assignedTranslations: Map<string, string>): Set<string> {
+  const keys = new Set<string>()
+  const pattern = /render\s+["']t_with_fallback["'][^%]*t:\s*([^\s,}]+)/g
+
+  const matches = [...content.matchAll(pattern)]
+  for (const match of matches) {
+    const varName = match[1]
+    const translationKey = assignedTranslations.get(varName)
+    if (translationKey) {
+      keys.add(translationKey)
+    }
+  }
+
+  return keys
+}
+
+export async function removeUnreferencedTranslationsFromTheme(
+  themeDir: string,
+  options: CleanOptions = {}
+): Promise<void> {
+  const { format, target = 'all' } = options;
+  const formatOptions: LocaleOptions = { format };
+
+  switch (target) {
+    case 'schema': {
+      await removeUnreferencedSchemaTranslations(themeDir, formatOptions)
+      break
+    }
+
+    case 'storefront': {
+      await removeUnreferencedStorefrontTranslations(themeDir, formatOptions)
+      break
+    }
+
+    default: {
+      await removeUnreferencedSchemaTranslations(themeDir, formatOptions)
+      await removeUnreferencedStorefrontTranslations(themeDir, formatOptions)
+      break
+    }
+  }
+}
+
+export async function removeUnreferencedSchemaTranslations(themeDir: string, options?: LocaleOptions): Promise<void> {
+  const usedKeys = findKeysInThemeFiles(themeDir, SCHEMA_DIRS, extractSchemaTranslationKeys)
+  const localesDir = path.join(themeDir, 'locales')
+
+  if (!fs.existsSync(localesDir)) {
+    throw new Error(`Locales directory does not exist: ${localesDir}`)
+  }
+
+  const schemaFiles = fs.readdirSync(localesDir)
+    .filter(file => file.endsWith('.schema.json'))
+
+  for (const file of schemaFiles) {
+    removeUnreferencedKeysFromFile(path.join(localesDir, file), usedKeys, options)
+  }
+}
+
+export async function removeUnreferencedStorefrontTranslations(themeDir: string, options?: LocaleOptions): Promise<void> {
+  const usedKeys = findKeysInThemeFiles(themeDir, STOREFRONT_DIRS, extractStorefrontTranslationKeys)
+  const localesDir = path.join(themeDir, 'locales')
+
+  if (!fs.existsSync(localesDir)) {
+    throw new Error(`Locales directory does not exist: ${localesDir}`)
+  }
+
+  const localeFiles = fs.readdirSync(localesDir)
+    .filter(file => file.endsWith('.json') && !file.endsWith('.schema.json'))
+
+  for (const file of localeFiles) {
+    removeUnreferencedKeysFromFile(path.join(localesDir, file), usedKeys, options)
+  }
+}
+
+function removeUnreferencedKeysFromFile(filePath: string, usedKeys: Set<string>, options?: LocaleOptions): void {
+  if (!fs.existsSync(filePath)) return
+
+  const content = JSON.parse(fs.readFileSync(filePath, 'utf8'))
+  if (!content || typeof content !== 'object') return
+
+  const flattenedContent = flattenObject(content)
+  const cleanedContent: Record<string, unknown> = {}
+
+  // Extract prefix keys
+  const prefixKeys = extractDynamicTranslationPrefixes(usedKeys)
+
+  // Process exact key matches and base paths
+  for (const [key, value] of Object.entries(flattenedContent)) {
+    const basePath = key.split('.').slice(0, -1).join('.')
+    if (usedKeys.has(key) || usedKeys.has(basePath)) {
+      cleanedContent[key] = value
+      continue
+    }
+
+    // Check if this key matches any of the prefix patterns
+    let matchesPrefix = false
+    for (const prefix of prefixKeys) {
+      if (key.startsWith(prefix)) {
+        matchesPrefix = true
+        break
+      }
+    }
+
+    if (matchesPrefix) {
+      cleanedContent[key] = value
+    }
+  }
+
+  const unflattened = unflattenObject(cleanedContent)
+  writeJsonFile(filePath, unflattened, options)
+}
+
+export async function mergeLocaleFiles(
+  themeDir: string,
+  sourceLocales: Record<string, Record<string, unknown>>,
+  options?: SyncOptions
+): Promise<void> {
+  const localesDir = path.join(themeDir, 'locales')
+  const { format = false, mode = 'add-missing', target = 'all' } = options ?? {}
+
+  if (!fs.existsSync(localesDir)) {
+    fs.mkdirSync(localesDir, { recursive: true })
+  }
+
+  const filesToSync = Object.entries(sourceLocales).filter(([file]) => {
+    const isSchemaFile = file.endsWith('.schema.json')
+
+    if (target === 'schema') return isSchemaFile
+    if (target === 'storefront') return !isSchemaFile
+    return true
+  })
+
+  for (const [file, sourceContent] of filesToSync) {
+    const targetPath = path.join(localesDir, file)
+
+    if (!fs.existsSync(targetPath)) {
+      writeJsonFile(targetPath, sourceContent, { format })
+      continue
+    }
+
+    const targetContent = JSON.parse(fs.readFileSync(targetPath, 'utf8'))
+    const diff = compareLocales(sourceContent, targetContent)
+
+    const mergedContent = mode === 'replace-existing'
+      ? replaceExistingTranslationsWithSourceValues(sourceContent, targetContent)
+      : mode === 'add-missing'
+        ? addMissingTranslationsFromSource(sourceContent, targetContent, diff)
+        : addAndOverrideTranslationsFromSource(sourceContent, targetContent, diff)
+
+    writeJsonFile(targetPath, mergedContent, { format })
+  }
+}
+
+export function compareLocales(source: Record<string, unknown>, target: Record<string, unknown>): LocaleDiff {
+  const flatSource = flattenObject(source)
+  const flatTarget = flattenObject(target)
+
+  return {
+    added: new Set(Object.keys(flatSource).filter(key => !(key in flatTarget))),
+    modified: new Set(Object.keys(flatSource).filter(key =>
+      key in flatTarget && flatSource[key] !== flatTarget[key]
+    )),
+    removed: new Set(Object.keys(flatTarget).filter(key => !(key in flatSource))),
+  }
+}
+
+function replaceExistingTranslationsWithSourceValues(
+  source: Record<string, unknown>,
+  target: Record<string, unknown>
+): Record<string, unknown> {
+  const updateValues = (targetObj: Record<string, unknown>, sourceObj: Record<string, unknown>): Record<string, unknown> => {
+    const result: Record<string, unknown> = {}
+
+    for (const [key, value] of Object.entries(targetObj)) {
+      const isNestedObject = typeof value === 'object' && value !== null
+      const hasSourceValue = key in sourceObj
+
+      if (isNestedObject && hasSourceValue && typeof sourceObj[key] === 'object') {
+        result[key] = updateValues(value as Record<string, unknown>, sourceObj[key] as Record<string, unknown>)
+      } else {
+        result[key] = hasSourceValue ? sourceObj[key] : value
+      }
+    }
+
+    return result
+  }
+
+  return updateValues(target, source)
+}
+
+function addMissingTranslationsFromSource(
+  source: Record<string, unknown>,
+  target: Record<string, unknown>,
+  diff: LocaleDiff
+): Record<string, unknown> {
+  const merged = { ...target }
+  const flatContent = flattenObject(source)
+  const flatMerged = flattenObject(merged)
+
+  for (const key of diff.added) {
+    flatMerged[key] = flatContent[key]
+  }
+
+  return unflattenObject(flatMerged)
+}
+
+function addAndOverrideTranslationsFromSource(
+  source: Record<string, unknown>,
+  target: Record<string, unknown>,
+  diff: LocaleDiff
+): Record<string, unknown> {
+  const merged = { ...target }
+  const flatContent = flattenObject(source)
+  const flatMerged = flattenObject(merged)
+
+  for (const key of [...diff.added, ...diff.modified]) {
+    flatMerged[key] = flatContent[key]
+  }
+
+  return unflattenObject(flatMerged)
+}
+
+export function filterSourceTranslationsToKeysUsedInTheme(
+  localesContent: Record<string, Record<string, unknown>>,
+  required: TranslationKeysUsedInTheme
+): LocaleContent {
+  const result: LocaleContent = {}
+
+  for (const [file, content] of Object.entries(localesContent)) {
+    const isSchema = file.endsWith('.schema.json')
+    const requiredKeys = isSchema ? required.schema : required.storefront
+    const flatContent = flattenObject(content)
+
+    result[file] = unflattenObject(filterContentByKeys(flatContent, requiredKeys))
+  }
+
+  return result
+}
+
+function filterContentByKeys(
+  flatContent: Record<string, unknown>,
+  requiredKeys: Set<string>
+): Record<string, unknown> {
+  const filteredContent: Record<string, unknown> = {}
+  const prefixKeys = extractDynamicTranslationPrefixes(requiredKeys)
+
+  // Process exact key matches
+  for (const key of requiredKeys) {
+    if (key in flatContent) {
+      filteredContent[key] = flatContent[key]
+    }
+  }
+
+  // Handle prefix matches for dynamic keys
+  for (const prefix of prefixKeys) {
+    for (const sourceKey of Object.keys(flatContent)) {
+      if (sourceKey.startsWith(prefix) && !(sourceKey in filteredContent)) {
+        filteredContent[sourceKey] = flatContent[sourceKey]
+      }
+    }
+  }
+
+  return filteredContent
+}
diff --git a/src/utilities/objects.ts b/src/utilities/objects.ts
index 81005540..922c083e 100644
--- a/src/utilities/objects.ts
+++ b/src/utilities/objects.ts
@@ -13,4 +13,58 @@ export function deepMerge(target: DeepObject, source: DeepObject): DeepObject {
   }
 
   return target
-} 
\ No newline at end of file
+}
+
+export function flattenObject(obj: Record<string, unknown>, prefix = ''): Record<string, unknown> {
+  const result: Record<string, unknown> = {}
+
+  for (const [key, value] of Object.entries(obj)) {
+    const newKey = prefix ? `${prefix}.${key}` : key
+
+    if (typeof value === 'object' && value !== null) {
+      Object.assign(result, flattenObject(value as Record<string, unknown>, newKey))
+    } else {
+      result[newKey] = value
+    }
+  }
+
+  return result
+}
+
+export function unflattenObject(obj: Record<string, unknown>): Record<string, unknown> {
+  const result: Record<string, unknown> = {}
+
+  for (const [key, value] of Object.entries(obj)) {
+    const parts = key.split('.')
+    let current = result
+
+    for (let i = 0; i < parts.length - 1; i++) {
+      const part = parts[i]
+      current[part] = current[part] || {}
+      current = current[part] as Record<string, unknown>
+    }
+
+    current[parts.at(-1)!] = value
+  }
+
+  return result
+}
+
+export function sortObjectKeys<T>(obj: T): T {
+  if (Array.isArray(obj)) {
+    return obj.map((item) => sortObjectKeys(item)) as T
+  }
+
+  if (obj !== null && typeof obj === 'object') {
+    const sortedObj: Record<string, unknown> = {}
+    const sortedKeys = Object.keys(obj as object).sort()
+
+    for (const key of sortedKeys) {
+      sortedObj[key] = sortObjectKeys((obj as Record<string, unknown>)[key])
+    }
+
+    return sortedObj as T
+  }
+
+  return obj
+}
diff --git a/src/utilities/types.ts b/src/utilities/types.ts
index 8d5efd37..7b0be31b 100644
--- a/src/utilities/types.ts
+++ b/src/utilities/types.ts
@@ -17,7 +17,7 @@ export interface TomlConfig {
 
 export interface LiquidNode {
   assets: string[]
-  body: string 
+  body: string
   file: string
   name: string
   setup: string[]
@@ -44,4 +44,37 @@ export interface Manifest {
       [name: string]: string;
     };
   }
-} 
\ No newline at end of file
+}
+
+// Locale-related types
+export type CleanTarget = 'all' | 'schema' | 'storefront'
+
+export interface LocaleOptions {
+  format?: boolean
+}
+
+export interface CleanOptions extends LocaleOptions {
+  target?: CleanTarget
+}
+
+export type SyncMode = 'add-and-override' | 'add-missing' | 'replace-existing'
+
+export interface SyncOptions extends LocaleOptions {
+  mode?: SyncMode
+  target?: CleanTarget
+}
+
+export interface LocaleContent {
+  [key: string]: Record<string, unknown>
+}
+
+export interface LocaleDiff {
+  added: Set<string>
+  modified: Set<string>
+  removed: Set<string>
+}
+
+export interface TranslationKeysUsedInTheme {
+  schema: Set<string>
+  storefront: Set<string>
+}
diff --git a/test/commands/theme/locale/clean.test.ts b/test/commands/theme/locale/clean.test.ts
new file mode 100644
index 00000000..746dcc6c
--- /dev/null
+++ b/test/commands/theme/locale/clean.test.ts
@@ -0,0 +1,159 @@
+import { runCommand } from '@oclif/test'
+import { expect } from 'chai'
+import * as fs from 'node:fs'
+import * as path from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const fixturesPath = path.join(__dirname, '../../../fixtures')
+const themePath = path.join(fixturesPath, 'theme')
+const testThemePath = path.join(fixturesPath, 'test-theme')
+const testThemeLocalesPath = path.join(testThemePath, 'locales')
+
+describe('theme locale clean', () => {
+  beforeEach(() => {
+    fs.cpSync(themePath, testThemePath, { recursive: true })
+    process.chdir(testThemePath)
+  })
+
+  afterEach(() => {
+    fs.rmSync(testThemePath, { force: true, recursive: true })
+  })
+
+  it('cleans unreferenced translations from all locale files by default', async () => {
+    await runCommand(['theme', 'locale', 'clean'])
+
+    const storefrontContent = JSON.parse(fs.readFileSync(path.join(testThemeLocalesPath, 'en.default.json'), 'utf8'))
+    expect(storefrontContent).to.not.have.property('unused')
+
+    const schemaContent = JSON.parse(fs.readFileSync(path.join(testThemeLocalesPath, 'en.default.schema.json'), 'utf8'))
+    expect(schemaContent).to.not.have.property('unused')
+  })
+
+  it('cleans only schema files when target is set to schema', async () => {
+    const backupDir = path.join(testThemePath, 'locales-backup')
+    fs.cpSync(testThemeLocalesPath, backupDir, { recursive: true })
+
+    await runCommand(['theme', 'locale', 'clean', '--target', 'schema'])
+
+    const schemaContent = JSON.parse(fs.readFileSync(path.join(testThemeLocalesPath, 'en.default.schema.json'), 'utf8'))
+    expect(schemaContent).to.not.have.property('unused')
+
+    const storefrontContent = JSON.parse(fs.readFileSync(path.join(testThemeLocalesPath, 'en.default.json'), 'utf8'))
+    const backupStorefrontContent = JSON.parse(fs.readFileSync(path.join(backupDir, 'en.default.json'), 'utf8'))
+    expect(storefrontContent).to.deep.equal(backupStorefrontContent)
+
+    fs.rmSync(backupDir, { force: true, recursive: true })
+  })
+
+  it('cleans only storefront files when target is set to storefront', async () => {
+    const backupDir = path.join(testThemePath, 'locales-backup')
+    fs.cpSync(testThemeLocalesPath, backupDir, { recursive: true })
+
+    await runCommand(['theme', 'locale', 'clean', '--target', 'storefront'])
+
+    const storefrontContent = JSON.parse(fs.readFileSync(path.join(testThemeLocalesPath, 'en.default.json'), 'utf8'))
+    expect(storefrontContent).to.not.have.property('unused')
+
+    const schemaContent = JSON.parse(fs.readFileSync(path.join(testThemeLocalesPath, 'en.default.schema.json'), 'utf8'))
+    const backupSchemaContent = JSON.parse(fs.readFileSync(path.join(backupDir, 'en.default.schema.json'), 'utf8'))
+    expect(schemaContent).to.deep.equal(backupSchemaContent)
+
+    fs.rmSync(backupDir, { force: true, recursive: true })
+  })
+
+  it('preserves referenced translations when cleaning', async () => {
+    await runCommand(['theme', 'locale', 'clean'])
+
+    const storefrontContent = JSON.parse(fs.readFileSync(path.join(testThemeLocalesPath, 'en.default.json'), 'utf8'))
+    expect(storefrontContent).to.have.nested.property('actions.add_to_cart')
+    expect(storefrontContent).to.have.nested.property('t_with_fallback.direct_key')
+    expect(storefrontContent).to.have.nested.property('t_with_fallback.variable_key')
+
+    const schemaContent = JSON.parse(fs.readFileSync(path.join(testThemeLocalesPath, 'en.default.schema.json'), 'utf8'))
+    expect(schemaContent).to.have.nested.property('section.name')
+    expect(schemaContent).to.have.nested.property('section.settings.logo_label')
+  })
+
+  it('can be run from a theme directory without an argument', async () => {
+    process.chdir(testThemePath)
+    await runCommand(['theme', 'locale', 'clean'])
+
+    const storefrontContent = JSON.parse(fs.readFileSync(path.join(testThemeLocalesPath, 'en.default.json'), 'utf8'))
+    expect(storefrontContent).to.not.have.property('unused')
+  })
+
+  it('formats the output files when format flag is set', async () => {
+    await runCommand(['theme', 'locale', 'clean', '--format'])
+
+    const storefrontFileContent = fs.readFileSync(path.join(testThemeLocalesPath, 'en.default.json'), 'utf8')
+
+    expect(storefrontFileContent).to.include('  "actions": {')
+    expect(storefrontFileContent).to.include('    "add_to_cart"')
+
+    const storefrontContent = JSON.parse(storefrontFileContent)
+    expect(storefrontContent).to.not.have.property('unused')
+    expect(storefrontContent).to.have.nested.property('actions.add_to_cart')
+  })
+
+  it('formats only target files when used with target flag', async () => {
+    const schemaFilePath = path.join(testThemeLocalesPath, 'en.default.schema.json')
+    const storefrontFilePath = path.join(testThemeLocalesPath, 'en.default.json')
+
+    const schemaContent = JSON.parse(fs.readFileSync(schemaFilePath, 'utf8'))
+    const storefrontContent = JSON.parse(fs.readFileSync(storefrontFilePath, 'utf8'))
+
+    fs.writeFileSync(schemaFilePath, JSON.stringify(schemaContent))
+    fs.writeFileSync(storefrontFilePath, JSON.stringify(storefrontContent))
+
+    await runCommand(['theme', 'locale', 'clean', '--format', '--target', 'schema'])
+
+    const formattedSchemaFileContent = fs.readFileSync(schemaFilePath, 'utf8')
+    const storefrontFileContent = fs.readFileSync(storefrontFilePath, 'utf8')
+
+    expect(formattedSchemaFileContent).to.include('  "section": {')
+    expect(formattedSchemaFileContent).to.include('    "name"')
+    expect(storefrontFileContent).not.to.include('  "actions": {')
+  })
+
+  it('formats nested objects correctly when format flag is set', async () => {
+    const schemaFilePath = path.join(testThemeLocalesPath, 'en.default.schema.json')
+    const originalSchemaContent = JSON.parse(fs.readFileSync(schemaFilePath, 'utf8'))
+    fs.writeFileSync(schemaFilePath, JSON.stringify(originalSchemaContent))
+
+    await runCommand(['theme', 'locale', 'clean', '--format'])
+
+    const formattedSchemaFileContent = fs.readFileSync(schemaFilePath, 'utf8')
+
+    expect(formattedSchemaFileContent).to.include('  "section": {')
+    expect(formattedSchemaFileContent).to.include('    "name"')
+    expect(formattedSchemaFileContent).to.include('    "settings": {')
+    expect(formattedSchemaFileContent).to.include('      "logo_label"')
+
+    const formattedSchemaContent = JSON.parse(formattedSchemaFileContent)
+    const keys = Object.keys(formattedSchemaContent)
+
+    if (keys.length > 1) {
+      const sectionIndex = keys.indexOf('section')
+      const additionalIndex = keys.indexOf('additional')
+
+      if (sectionIndex !== -1 && additionalIndex !== -1) {
+        expect(additionalIndex).to.be.lessThan(sectionIndex)
+      }
+    }
+  })
+
+  it('preserves dynamic translation keys with prefixes', async () => {
+    await runCommand(['theme', 'locale', 'sync', '--locales-source', path.join(fixturesPath, 'locales'), '--clean'])
+
+    const storefrontContent = JSON.parse(fs.readFileSync(path.join(testThemeLocalesPath, 'en.default.json'), 'utf8'))
+
+    expect(storefrontContent).to.have.nested.property('tags.new')
+    expect(storefrontContent).to.have.nested.property('tags.sale')
+    expect(storefrontContent).to.have.nested.property('tags.featured')
+    expect(storefrontContent).to.have.nested.property('tags.custom')
+    expect(storefrontContent).to.have.nested.property('tags.special')
+
+    expect(storefrontContent).to.not.have.property('unused')
+  })
+})
diff --git a/test/commands/theme/locale/sync.test.ts b/test/commands/theme/locale/sync.test.ts
new file mode 100644
index 00000000..e00e96b8
--- /dev/null
+++ b/test/commands/theme/locale/sync.test.ts
@@ -0,0 +1,208 @@
+import { runCommand } from '@oclif/test'
+import { expect } from 'chai'
+import * as fs from 'node:fs'
+import * as path from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const fixturesPath = path.join(__dirname, '../../../fixtures')
+const localesPath = path.join(fixturesPath, 'locales')
+const themePath = path.join(fixturesPath, 'theme')
+const testThemePath = path.join(fixturesPath, 'test-theme')
+const testThemeLocalesPath = path.join(testThemePath, 'locales')
+
+describe('theme locale sync', () => {
+  const sourceEnDefault = JSON.parse(fs.readFileSync(path.join(localesPath, 'en.default.json'), 'utf8'))
+  const sourceFr = JSON.parse(fs.readFileSync(path.join(localesPath, 'fr.json'), 'utf8'))
+
+  beforeEach(() => {
+    fs.cpSync(themePath, testThemePath, { recursive: true })
+    process.chdir(testThemePath)
+  })
+
+  afterEach(() => {
+    fs.rmSync(testThemePath, { force: true, recursive: true })
+  })
+
+  it('syncs locale files from a local source', async () => {
+    await runCommand(['theme', 'locale', 'sync', '--locales-source', localesPath])
+
+    expect(fs.existsSync(path.join(testThemeLocalesPath, 'en.default.json'))).to.be.true
+    expect(fs.existsSync(path.join(testThemeLocalesPath, 'en.default.schema.json'))).to.be.true
+    expect(fs.existsSync(path.join(testThemeLocalesPath, 'fr.json'))).to.be.true
+    expect(fs.existsSync(path.join(testThemeLocalesPath, 'fr.schema.json'))).to.be.true
+
+    const storefrontContent = JSON.parse(fs.readFileSync(path.join(testThemeLocalesPath, 'en.default.json'), 'utf8'))
+    expect(storefrontContent).to.have.nested.property('actions.add_to_cart')
+    expect(storefrontContent).to.have.nested.property('t_with_fallback.direct_key')
+    expect(storefrontContent).to.have.nested.property('t_with_fallback.variable_key')
+
+    const frStorefrontContent = JSON.parse(fs.readFileSync(path.join(testThemeLocalesPath, 'fr.json'), 'utf8'))
+    expect(frStorefrontContent).to.have.nested.property('actions.add_to_cart')
+    expect(frStorefrontContent).to.have.nested.property('t_with_fallback.direct_key')
+    expect(frStorefrontContent).to.have.nested.property('t_with_fallback.variable_key')
+
+    expect(frStorefrontContent.actions.add_to_cart).to.equal(sourceFr.actions.add_to_cart)
+  })
+
+  it('syncs only schema files when target is set to schema', async () => {
+    const originalStorefrontContent = JSON.parse(fs.readFileSync(path.join(testThemeLocalesPath, 'en.default.json'), 'utf8'))
+    const originalSchemaContent = JSON.parse(fs.readFileSync(path.join(testThemeLocalesPath, 'en.default.schema.json'), 'utf8'))
+
+    await runCommand(['theme', 'locale', 'sync', '--locales-source', localesPath, '--target', 'schema'])
+
+    const schemaContent = JSON.parse(fs.readFileSync(path.join(testThemeLocalesPath, 'en.default.schema.json'), 'utf8'))
+
+    expect(schemaContent.section.name).to.equal(originalSchemaContent.section.name)
+    expect(schemaContent.section.settings.logo_label).to.equal(originalSchemaContent.section.settings.logo_label)
+
+    expect(schemaContent).to.not.have.nested.property('additional.new_setting')
+
+    const storefrontContent = JSON.parse(fs.readFileSync(path.join(testThemeLocalesPath, 'en.default.json'), 'utf8'))
+    expect(storefrontContent).to.deep.equal(originalStorefrontContent)
+  })
+
+  it('syncs only storefront files when target is set to storefront', async () => {
+    const originalSchemaContent = JSON.parse(fs.readFileSync(path.join(testThemeLocalesPath, 'en.default.schema.json'), 'utf8'))
+
+    await runCommand(['theme', 'locale', 'sync', '--locales-source', localesPath, '--target', 'storefront'])
+
+    const storefrontContent = JSON.parse(fs.readFileSync(path.join(testThemeLocalesPath, 'en.default.json'), 'utf8'))
+    expect(storefrontContent).to.have.nested.property('actions.add_to_cart')
+
+    const schemaContent = JSON.parse(fs.readFileSync(path.join(testThemeLocalesPath, 'en.default.schema.json'), 'utf8'))
+    expect(schemaContent).to.deep.equal(originalSchemaContent)
+  })
+
+  it('adds missing translations when mode is set to add-missing', async () => {
+    const storefrontFilePath = path.join(testThemeLocalesPath, 'en.default.json')
+    const storefrontContent = JSON.parse(fs.readFileSync(storefrontFilePath, 'utf8'))
+    const originalAddToCartValue = storefrontContent.actions.add_to_cart
+
+    await runCommand(['theme', 'locale', 'sync', '--locales-source', localesPath, '--mode', 'add-missing'])
+
+    const updatedStorefrontContent = JSON.parse(fs.readFileSync(storefrontFilePath, 'utf8'))
+
+    expect(updatedStorefrontContent.actions.add_to_cart).to.equal(originalAddToCartValue)
+
+    expect(updatedStorefrontContent).to.not.have.nested.property('additional.new_key')
+  })
+
+  it('replaces existing translations when mode is set to replace-existing', async () => {
+    const storefrontFilePath = path.join(testThemeLocalesPath, 'en.default.json')
+    const storefrontContent = JSON.parse(fs.readFileSync(storefrontFilePath, 'utf8'))
+    const originalAddToCartValue = storefrontContent.actions.add_to_cart
+
+    expect(originalAddToCartValue).to.not.equal(sourceEnDefault.actions.add_to_cart)
+
+    await runCommand(['theme', 'locale', 'sync', '--locales-source', localesPath, '--mode', 'replace-existing'])
+
+    const updatedStorefrontContent = JSON.parse(fs.readFileSync(storefrontFilePath, 'utf8'))
+
+    expect(updatedStorefrontContent.actions.add_to_cart).to.not.equal(originalAddToCartValue)
+    expect(updatedStorefrontContent.actions.add_to_cart).to.equal(sourceEnDefault.actions.add_to_cart)
+  })
+
+  it('adds and overrides translations when mode is set to add-and-override', async () => {
+    const storefrontFilePath = path.join(testThemeLocalesPath, 'en.default.json')
+    const storefrontContent = JSON.parse(fs.readFileSync(storefrontFilePath, 'utf8'))
+    const originalAddToCartValue = storefrontContent.actions.add_to_cart
+
+    expect(originalAddToCartValue).to.not.equal(sourceEnDefault.actions.add_to_cart)
+
+    await runCommand(['theme', 'locale', 'sync', '--locales-source', localesPath, '--mode', 'add-and-override'])
+
+    const updatedStorefrontContent = JSON.parse(fs.readFileSync(storefrontFilePath, 'utf8'))
+
+    expect(updatedStorefrontContent.actions.add_to_cart).to.not.equal(originalAddToCartValue)
+    expect(updatedStorefrontContent.actions.add_to_cart).to.equal(sourceEnDefault.actions.add_to_cart)
+
+    expect(updatedStorefrontContent).to.not.have.nested.property('additional.new_key')
+  })
+
+  it('formats the output files when format flag is set', async () => {
+    await runCommand(['theme', 'locale', 'sync', '--locales-source', localesPath, '--format'])
+
+    const storefrontFileContent = fs.readFileSync(path.join(testThemeLocalesPath, 'en.default.json'), 'utf8')
+    expect(storefrontFileContent).to.include('  "actions": {')
+    expect(storefrontFileContent).to.include('    "add_to_cart"')
+  })
+
+  it('cleans locale files when clean flag is set', async () => {
+    await runCommand(['theme', 'locale', 'sync', '--locales-source', localesPath, '--clean'])
+
+    const storefrontContent = JSON.parse(fs.readFileSync(path.join(testThemeLocalesPath, 'en.default.json'), 'utf8'))
+
+    expect(storefrontContent).to.not.have.property('unused')
+
+    expect(storefrontContent).to.have.nested.property('actions.add_to_cart')
+    expect(storefrontContent).to.have.nested.property('t_with_fallback.direct_key')
+    expect(storefrontContent).to.have.nested.property('t_with_fallback.variable_key')
+  })
+
+  it('syncs schema files with add-and-override mode', async () => {
+    const sourceEnDefaultSchema = JSON.parse(fs.readFileSync(path.join(localesPath, 'en.default.schema.json'), 'utf8'))
+    const originalSchemaContent = JSON.parse(fs.readFileSync(path.join(testThemeLocalesPath, 'en.default.schema.json'), 'utf8'))
+
+    expect(originalSchemaContent.section.name).to.not.equal(sourceEnDefaultSchema.section.name)
+
+    await runCommand(['theme', 'locale', 'sync', '--locales-source', localesPath, '--target', 'schema', '--mode', 'add-and-override'])
+
+    const schemaContent = JSON.parse(fs.readFileSync(path.join(testThemeLocalesPath, 'en.default.schema.json'), 'utf8'))
+
+    expect(schemaContent.section.name).to.not.equal(originalSchemaContent.section.name)
+    expect(schemaContent.section.name).to.equal(sourceEnDefaultSchema.section.name)
+    expect(schemaContent.section.settings.logo_label).to.equal(sourceEnDefaultSchema.section.settings.logo_label)
+
+    expect(schemaContent).to.not.have.nested.property('additional.new_setting')
+  })
+
+  it('does not add unreferenced translations', async () => {
+    const storefrontFilePath = path.join(testThemeLocalesPath, 'en.default.json')
+    const schemaFilePath = path.join(testThemeLocalesPath, 'en.default.schema.json')
+
+    await runCommand(['theme', 'locale', 'sync', '--locales-source', localesPath])
+
+    const storefrontContent = JSON.parse(fs.readFileSync(storefrontFilePath, 'utf8'))
+    const schemaContent = JSON.parse(fs.readFileSync(schemaFilePath, 'utf8'))
+
+    expect(storefrontContent).to.not.have.nested.property('additional.new_key')
+    expect(schemaContent).to.not.have.nested.property('additional.new_setting')
+
+    expect(storefrontContent).to.have.nested.property('actions.add_to_cart')
+    expect(storefrontContent).to.have.nested.property('t_with_fallback.direct_key')
+    expect(storefrontContent).to.have.nested.property('t_with_fallback.variable_key')
+    expect(schemaContent).to.have.nested.property('section.name')
+    expect(schemaContent).to.have.nested.property('section.settings.logo_label')
+  })
+
+  it('syncs dynamic translation keys with prefixes', async () => {
+    await runCommand(['theme', 'locale', 'sync', '--locales-source', localesPath])
+
+    const storefrontContent = JSON.parse(fs.readFileSync(path.join(testThemeLocalesPath, 'en.default.json'), 'utf8'))
+
+    expect(storefrontContent).to.have.nested.property('tags.new')
+    expect(storefrontContent).to.have.nested.property('tags.sale')
+    expect(storefrontContent).to.have.nested.property('tags.featured')
+    expect(storefrontContent).to.have.nested.property('tags.custom')
+    expect(storefrontContent).to.have.nested.property('tags.special')
+
+    expect(storefrontContent.tags.new).to.equal(sourceEnDefault.tags.new)
+
+    const frStorefrontContent = JSON.parse(fs.readFileSync(path.join(testThemeLocalesPath, 'fr.json'), 'utf8'))
+    expect(frStorefrontContent).to.have.nested.property('tags.new')
+    expect(frStorefrontContent.tags.new).to.equal(sourceFr.tags.new)
+  })
+
+  it('cleans dynamic translation keys but keeps referenced prefixes', async () => {
+    await runCommand(['theme', 'locale', 'sync', '--locales-source', localesPath, '--clean'])
+
+    const storefrontContent = JSON.parse(fs.readFileSync(path.join(testThemeLocalesPath, 'en.default.json'), 'utf8'))
+
+    expect(storefrontContent).to.have.nested.property('tags.new')
+
+    // These should also be kept because they share the same prefix
+    expect(storefrontContent).to.have.nested.property('tags.sale')
+    expect(storefrontContent).to.have.nested.property('tags.featured')
+  })
+})
diff --git a/test/fixtures/locales/en.default.json b/test/fixtures/locales/en.default.json
new file mode 100644
index 00000000..329174ae
--- /dev/null
+++ b/test/fixtures/locales/en.default.json
@@ -0,0 +1,19 @@
+{
+  "actions": {
+    "add_to_cart": "Add to cart (source)"
+  },
+  "additional": {
+    "new_key": "This is a new translation (source)"
+  },
+  "t_with_fallback": {
+    "direct_key": "Direct key (source)",
+    "variable_key": "Variable key (source)"
+  },
+  "tags": {
+    "new": "New",
+    "sale": "Sale",
+    "featured": "Featured",
+    "custom": "Custom Tag",
+    "special": "Special Tag"
+  }
+}
diff --git a/test/fixtures/locales/en.default.schema.json b/test/fixtures/locales/en.default.schema.json
new file mode 100644
index 00000000..229e45da
--- /dev/null
+++ b/test/fixtures/locales/en.default.schema.json
@@ -0,0 +1,11 @@
+{
+  "section": {
+    "name": "Section schema (source)",
+    "settings": {
+      "logo_label": "Logo Setting (source)"
+    }
+  },
+  "additional": {
+    "new_setting": "This is a new schema setting (source)"
+  }
+}
diff --git a/test/fixtures/locales/fr.json b/test/fixtures/locales/fr.json
new file mode 100644
index 00000000..030c44a1
--- /dev/null
+++ b/test/fixtures/locales/fr.json
@@ -0,0 +1,19 @@
+{
+  "actions": {
+    "add_to_cart": "Ajouter au panier (source)"
+  },
+  "additional": {
+    "new_key": "Ceci est une nouvelle traduction (source)"
+  },
+  "t_with_fallback": {
+    "direct_key": "Clé directe (source)",
+    "variable_key": "Clé variable (source)"
+  },
+  "tags": {
+    "new": "Nouveau",
+    "sale": "En solde",
+    "featured": "En vedette",
+    "custom": "Personnalisée",
+    "special": "Spéciale"
+  }
+}
diff --git a/test/fixtures/locales/fr.schema.json b/test/fixtures/locales/fr.schema.json
new file mode 100644
index 00000000..d8eb62f9
--- /dev/null
+++ b/test/fixtures/locales/fr.schema.json
@@ -0,0 +1,11 @@
+{
+  "section": {
+    "name": "Schéma de section (source)",
+    "settings": {
+      "logo_label": "Paramètre de Logo (source)"
+    }
+  },
+  "additional": {
+    "new_setting": "Ceci est un nouveau paramètre de schéma (source)"
+  }
+}
diff --git a/test/fixtures/theme/locales/en.default.json b/test/fixtures/theme/locales/en.default.json
new file mode 100644
index 00000000..23c96b7c
--- /dev/null
+++ b/test/fixtures/theme/locales/en.default.json
@@ -0,0 +1,10 @@
+{
+  "actions": {
+    "add_to_cart": "Add to cart"
+  },
+  "t_with_fallback": {
+    "direct_key": "Direct key",
+    "variable_key": "Variable key"
+  },
+  "unused": "This is an unused translation"
+}
diff --git a/test/fixtures/theme/locales/en.default.schema.json b/test/fixtures/theme/locales/en.default.schema.json
new file mode 100644
index 00000000..6bcf3553
--- /dev/null
+++ b/test/fixtures/theme/locales/en.default.schema.json
@@ -0,0 +1,9 @@
+{
+  "section": {
+    "name": "Section schema",
+    "settings": {
+      "logo_label": "Logo Setting"
+    }
+  },
+  "unused": "This is an unused schema translation"
+}
diff --git a/test/fixtures/theme/sections/schema-translation-usage.liquid b/test/fixtures/theme/sections/schema-translation-usage.liquid
new file mode 100644
index 00000000..56d9416a
--- /dev/null
+++ b/test/fixtures/theme/sections/schema-translation-usage.liquid
@@ -0,0 +1,12 @@
+{% schema %}
+{
+  "name": "t:section.name",
+  "settings": [
+    {
+      "type": "image_picker",
+      "id": "logo",
+      "label": "t:section.settings.logo_label"
+    }
+  ]
+}
+{% endschema %}
diff --git a/test/fixtures/theme/snippets/dynamic-translation-usage.liquid b/test/fixtures/theme/snippets/dynamic-translation-usage.liquid
new file mode 100644
index 00000000..1361afa2
--- /dev/null
+++ b/test/fixtures/theme/snippets/dynamic-translation-usage.liquid
@@ -0,0 +1,18 @@
+{% # Basic dynamic translation with append %}
+{{ 'tags.' | append: 'new' | t }}
+
+{% # Dynamic translation in HTML element %}
+<span>{{ 'tags.' | append: 'sale' | t }}</span>
+
+{% # Dynamic translation with multiple filters %}
+{{ 'tags.' | append: 'featured' | replace: '-', '_' | t }}
+
+{% # Dynamic translation with liquid tag assign %}
+{% assign tag_id = 'custom' %}
+{% assign tag_text = 'tags.' | append: tag_id | t %}
+
+{% # Dynamic translation with liquid tag block %}
+{% liquid
+  assign special_tag = 'special'
+  assign special_tag_text = 'tags.' | append: special_tag | t
+%}
diff --git a/test/fixtures/theme/snippets/storefront-translation-usage.liquid b/test/fixtures/theme/snippets/storefront-translation-usage.liquid
new file mode 100644
index 00000000..d7729eff
--- /dev/null
+++ b/test/fixtures/theme/snippets/storefront-translation-usage.liquid
@@ -0,0 +1 @@
+<button>{{ 'actions.add_to_cart' | t }}</button>
diff --git a/test/fixtures/theme/snippets/t-with-fallback-usage.liquid b/test/fixtures/theme/snippets/t-with-fallback-usage.liquid
new file mode 100644
index 00000000..e8d9b730
--- /dev/null
+++ b/test/fixtures/theme/snippets/t-with-fallback-usage.liquid
@@ -0,0 +1,3 @@
+{%- assign translation_key = 't_with_fallback.variable_key' | t -%}
+{%- render 't_with_fallback', t: translation_key -%}
+{%- render 't_with_fallback', key: 't_with_fallback.direct_key' -%}