diff --git a/src/controllers/patch.ts b/src/controllers/patch.ts
index e0276ad..41810f7 100644
--- a/src/controllers/patch.ts
+++ b/src/controllers/patch.ts
@@ -10,7 +10,7 @@ import {
   rmSync,
   statSync,
 } from 'fs-extra'
-import { join, resolve } from 'path'
+import { dirname, join, resolve } from 'path'
 import readline from 'readline'
 import sharp from 'sharp'
 import { log } from '..'
@@ -266,13 +266,14 @@ export class BrandingPatch extends PatchBase implements IPatchApplier {
       await sharp(branding).resize(64, 64).toFile(join(dest, 'firefox64.ico'))
 
       // Copy everything else from the default firefox branding directory
-      ;(await walkDirectory(BRANDING_DIR))
+      ;(await walkDirectory(join(ENGINE_DIR, 'branding', 'unofficial')))
         .filter(
           (file) => !existsSync(join(dest, file.replace(BRANDING_DIR, '')))
         )
-        .forEach((file) =>
+        .forEach((file) => {
+          mkdirpSync(dirname(join(dest, file.replace(BRANDING_DIR, ''))))
           copyFileSync(file, join(dest, file.replace(BRANDING_DIR, '')))
-        )
+        })
 
       this.done = true
     } catch (e) {
diff --git a/template/configs/common/mozconfig b/template/configs/common/mozconfig
index 62b572e..778880c 100644
--- a/template/configs/common/mozconfig
+++ b/template/configs/common/mozconfig
@@ -1,17 +1,16 @@
 # Browser branding
 ac_add_options --enable-update-channel=release
 
-# TODO: Setup a branding generator
-# ac_add_options --with-branding=dot/branding
+ac_add_options --with-branding=${brandingDir}
 ac_add_options --with-app-name=dot
 export MOZ_USER_DIR="${name}"
 export MOZ_APP_VENDOR="${vendor}"
 export MOZ_APP_BASENAME=Dot
 export MOZ_APP_PROFILE=dot
 export MOZ_APP_DISPLAYNAME="${name}"
-# export MOZ_BRANDING_DIRECTORY=dot/branding
-# export MOZ_OFFICIAL_BRANDING_DIRECTORY=dot/branding
-export MOZ_MACBUNDLE_ID=%{appId}
+export MOZ_BRANDING_DIRECTORY=${brandingDir}
+export MOZ_OFFICIAL_BRANDING_DIRECTORY=${brandingDir}
+export MOZ_MACBUNDLE_ID=${appId}
 export MOZ_DISTRIBUTION_ID=${appId}
 
 # Uncomment if builds are too resource hungry