diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..ce118b2
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "fira"]
+	path = fira
+	url = https://github.com/mozilla/Fira
diff --git a/fira b/fira
new file mode 160000
index 0000000..48a8d0a
--- /dev/null
+++ b/fira
@@ -0,0 +1 @@
+Subproject commit 48a8d0a0354e933c0d1cfcf9feb07ccb00eb6fa9
diff --git a/theme/src/main/AndroidManifest.xml b/theme/src/main/AndroidManifest.xml
index 0a35229..3754a5f 100644
--- a/theme/src/main/AndroidManifest.xml
+++ b/theme/src/main/AndroidManifest.xml
@@ -24,6 +24,7 @@
     <meta-data android:name="org.cyanogenmod.theme.author" android:value="@string/theme_author" />
 
     <application android:hasCode="false"
+        android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/theme_name"/>
 
diff --git a/theme/src/main/assets/fonts/FiraMono-Bold.otf b/theme/src/main/assets/fonts/FiraMono-Bold.otf
new file mode 120000
index 0000000..f3c18b0
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraMono-Bold.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraMono-Bold.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraMono-Bold.ttf b/theme/src/main/assets/fonts/FiraMono-Bold.ttf
deleted file mode 100644
index 3d1483b..0000000
Binary files a/theme/src/main/assets/fonts/FiraMono-Bold.ttf and /dev/null differ
diff --git a/theme/src/main/assets/fonts/FiraMono-Medium.otf b/theme/src/main/assets/fonts/FiraMono-Medium.otf
new file mode 120000
index 0000000..c37e78b
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraMono-Medium.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraMono-Medium.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraMono-Medium.ttf b/theme/src/main/assets/fonts/FiraMono-Medium.ttf
deleted file mode 100644
index 9bc64f5..0000000
Binary files a/theme/src/main/assets/fonts/FiraMono-Medium.ttf and /dev/null differ
diff --git a/theme/src/main/assets/fonts/FiraMono-Regular.otf b/theme/src/main/assets/fonts/FiraMono-Regular.otf
new file mode 120000
index 0000000..4099d21
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraMono-Regular.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraMono-Regular.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraMono-Regular.ttf b/theme/src/main/assets/fonts/FiraMono-Regular.ttf
deleted file mode 100644
index 2f27fc4..0000000
Binary files a/theme/src/main/assets/fonts/FiraMono-Regular.ttf and /dev/null differ
diff --git a/theme/src/main/assets/fonts/FiraSans-Bold.otf b/theme/src/main/assets/fonts/FiraSans-Bold.otf
new file mode 120000
index 0000000..774c2f1
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSans-Bold.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSans-Bold.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSans-Bold.ttf b/theme/src/main/assets/fonts/FiraSans-Bold.ttf
deleted file mode 100644
index 43c6d94..0000000
Binary files a/theme/src/main/assets/fonts/FiraSans-Bold.ttf and /dev/null differ
diff --git a/theme/src/main/assets/fonts/FiraSans-BoldItalic.otf b/theme/src/main/assets/fonts/FiraSans-BoldItalic.otf
new file mode 120000
index 0000000..d0af041
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSans-BoldItalic.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSans-BoldItalic.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSans-BoldItalic.ttf b/theme/src/main/assets/fonts/FiraSans-BoldItalic.ttf
deleted file mode 100644
index a4c6270..0000000
Binary files a/theme/src/main/assets/fonts/FiraSans-BoldItalic.ttf and /dev/null differ
diff --git a/theme/src/main/assets/fonts/FiraSans-Heavy.otf b/theme/src/main/assets/fonts/FiraSans-Heavy.otf
new file mode 120000
index 0000000..ed0f20b
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSans-Heavy.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSans-Heavy.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSans-Heavy.ttf b/theme/src/main/assets/fonts/FiraSans-Heavy.ttf
deleted file mode 100644
index 103227c..0000000
Binary files a/theme/src/main/assets/fonts/FiraSans-Heavy.ttf and /dev/null differ
diff --git a/theme/src/main/assets/fonts/FiraSans-HeavyItalic.otf b/theme/src/main/assets/fonts/FiraSans-HeavyItalic.otf
new file mode 120000
index 0000000..352a6eb
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSans-HeavyItalic.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSans-HeavyItalic.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSans-HeavyItalic.ttf b/theme/src/main/assets/fonts/FiraSans-HeavyItalic.ttf
deleted file mode 100644
index 0dea39a..0000000
Binary files a/theme/src/main/assets/fonts/FiraSans-HeavyItalic.ttf and /dev/null differ
diff --git a/theme/src/main/assets/fonts/FiraSans-Italic.otf b/theme/src/main/assets/fonts/FiraSans-Italic.otf
new file mode 120000
index 0000000..0b49417
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSans-Italic.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSans-Italic.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSans-Italic.ttf b/theme/src/main/assets/fonts/FiraSans-Italic.ttf
deleted file mode 100644
index 3e97567..0000000
Binary files a/theme/src/main/assets/fonts/FiraSans-Italic.ttf and /dev/null differ
diff --git a/theme/src/main/assets/fonts/FiraSans-Light.otf b/theme/src/main/assets/fonts/FiraSans-Light.otf
new file mode 120000
index 0000000..1e1c72c
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSans-Light.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSans-Light.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSans-Light.ttf b/theme/src/main/assets/fonts/FiraSans-Light.ttf
deleted file mode 100644
index 03fff66..0000000
Binary files a/theme/src/main/assets/fonts/FiraSans-Light.ttf and /dev/null differ
diff --git a/theme/src/main/assets/fonts/FiraSans-LightItalic.otf b/theme/src/main/assets/fonts/FiraSans-LightItalic.otf
new file mode 120000
index 0000000..3d8983a
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSans-LightItalic.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSans-LightItalic.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSans-LightItalic.ttf b/theme/src/main/assets/fonts/FiraSans-LightItalic.ttf
deleted file mode 100644
index 12ba41a..0000000
Binary files a/theme/src/main/assets/fonts/FiraSans-LightItalic.ttf and /dev/null differ
diff --git a/theme/src/main/assets/fonts/FiraSans-Medium.otf b/theme/src/main/assets/fonts/FiraSans-Medium.otf
new file mode 120000
index 0000000..a275ec4
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSans-Medium.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSans-Medium.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSans-Medium.ttf b/theme/src/main/assets/fonts/FiraSans-Medium.ttf
deleted file mode 100644
index 317f4e2..0000000
Binary files a/theme/src/main/assets/fonts/FiraSans-Medium.ttf and /dev/null differ
diff --git a/theme/src/main/assets/fonts/FiraSans-MediumItalic.otf b/theme/src/main/assets/fonts/FiraSans-MediumItalic.otf
new file mode 120000
index 0000000..02add66
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSans-MediumItalic.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSans-MediumItalic.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSans-MediumItalic.ttf b/theme/src/main/assets/fonts/FiraSans-MediumItalic.ttf
deleted file mode 100644
index f37aaad..0000000
Binary files a/theme/src/main/assets/fonts/FiraSans-MediumItalic.ttf and /dev/null differ
diff --git a/theme/src/main/assets/fonts/FiraSans-Regular.otf b/theme/src/main/assets/fonts/FiraSans-Regular.otf
new file mode 120000
index 0000000..9878a91
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSans-Regular.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSans-Regular.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSans-Regular.ttf b/theme/src/main/assets/fonts/FiraSans-Regular.ttf
deleted file mode 100644
index 1eb625c..0000000
Binary files a/theme/src/main/assets/fonts/FiraSans-Regular.ttf and /dev/null differ
diff --git a/theme/src/main/assets/fonts/FiraSans-SemiBold.otf b/theme/src/main/assets/fonts/FiraSans-SemiBold.otf
new file mode 120000
index 0000000..a0627ae
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSans-SemiBold.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSans-SemiBold.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSans-SemiBold.ttf b/theme/src/main/assets/fonts/FiraSans-SemiBold.ttf
deleted file mode 100644
index a2ea692..0000000
Binary files a/theme/src/main/assets/fonts/FiraSans-SemiBold.ttf and /dev/null differ
diff --git a/theme/src/main/assets/fonts/FiraSans-SemiBoldItalic.otf b/theme/src/main/assets/fonts/FiraSans-SemiBoldItalic.otf
new file mode 120000
index 0000000..97f6a9b
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSans-SemiBoldItalic.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSans-SemiBoldItalic.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSans-SemiBoldItalic.ttf b/theme/src/main/assets/fonts/FiraSans-SemiBoldItalic.ttf
deleted file mode 100644
index a9be8a1..0000000
Binary files a/theme/src/main/assets/fonts/FiraSans-SemiBoldItalic.ttf and /dev/null differ
diff --git a/theme/src/main/assets/fonts/FiraSans-Thin.otf b/theme/src/main/assets/fonts/FiraSans-Thin.otf
new file mode 120000
index 0000000..f62e7e9
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSans-Thin.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSans-Thin.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSans-Thin.ttf b/theme/src/main/assets/fonts/FiraSans-Thin.ttf
deleted file mode 100644
index a553f4a..0000000
Binary files a/theme/src/main/assets/fonts/FiraSans-Thin.ttf and /dev/null differ
diff --git a/theme/src/main/assets/fonts/FiraSans-ThinItalic.otf b/theme/src/main/assets/fonts/FiraSans-ThinItalic.otf
new file mode 120000
index 0000000..01c38ea
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSans-ThinItalic.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSans-ThinItalic.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSans-ThinItalic.ttf b/theme/src/main/assets/fonts/FiraSans-ThinItalic.ttf
deleted file mode 100644
index 0cc8743..0000000
Binary files a/theme/src/main/assets/fonts/FiraSans-ThinItalic.ttf and /dev/null differ
diff --git a/theme/src/main/assets/fonts/FiraSans-Ultra.otf b/theme/src/main/assets/fonts/FiraSans-Ultra.otf
new file mode 120000
index 0000000..32cb14c
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSans-Ultra.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSans-Ultra.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSans-Ultra.ttf b/theme/src/main/assets/fonts/FiraSans-Ultra.ttf
deleted file mode 100644
index c06661b..0000000
Binary files a/theme/src/main/assets/fonts/FiraSans-Ultra.ttf and /dev/null differ
diff --git a/theme/src/main/assets/fonts/FiraSans-UltraItalic.otf b/theme/src/main/assets/fonts/FiraSans-UltraItalic.otf
new file mode 120000
index 0000000..d6e1f69
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSans-UltraItalic.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSans-UltraItalic.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSans-UltraItalic.ttf b/theme/src/main/assets/fonts/FiraSans-UltraItalic.ttf
deleted file mode 100644
index ba5e690..0000000
Binary files a/theme/src/main/assets/fonts/FiraSans-UltraItalic.ttf and /dev/null differ
diff --git a/theme/src/main/assets/fonts/FiraSans-UltraLight.otf b/theme/src/main/assets/fonts/FiraSans-UltraLight.otf
new file mode 120000
index 0000000..45dd59b
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSans-UltraLight.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSans-UltraLight.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSans-UltraLight.ttf b/theme/src/main/assets/fonts/FiraSans-UltraLight.ttf
deleted file mode 100644
index 4c6eafc..0000000
Binary files a/theme/src/main/assets/fonts/FiraSans-UltraLight.ttf and /dev/null differ
diff --git a/theme/src/main/assets/fonts/FiraSans-UltraLightItalic.otf b/theme/src/main/assets/fonts/FiraSans-UltraLightItalic.otf
new file mode 120000
index 0000000..db919f7
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSans-UltraLightItalic.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSans-UltraLightItalic.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSans-UltraLightItalic.ttf b/theme/src/main/assets/fonts/FiraSans-UltraLightItalic.ttf
deleted file mode 100644
index eb7e311..0000000
Binary files a/theme/src/main/assets/fonts/FiraSans-UltraLightItalic.ttf and /dev/null differ
diff --git a/theme/src/main/assets/fonts/FiraSansCondensed-Bold.otf b/theme/src/main/assets/fonts/FiraSansCondensed-Bold.otf
new file mode 120000
index 0000000..a44cd54
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSansCondensed-Bold.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSansCondensed-Bold.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSansCondensed-BoldItalic.otf b/theme/src/main/assets/fonts/FiraSansCondensed-BoldItalic.otf
new file mode 120000
index 0000000..9e491ee
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSansCondensed-BoldItalic.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSansCondensed-BoldItalic.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSansCondensed-Heavy.otf b/theme/src/main/assets/fonts/FiraSansCondensed-Heavy.otf
new file mode 120000
index 0000000..42c4225
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSansCondensed-Heavy.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSansCondensed-Heavy.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSansCondensed-HeavyItalic.otf b/theme/src/main/assets/fonts/FiraSansCondensed-HeavyItalic.otf
new file mode 120000
index 0000000..e706228
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSansCondensed-HeavyItalic.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSansCondensed-HeavyItalic.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSansCondensed-Italic.otf b/theme/src/main/assets/fonts/FiraSansCondensed-Italic.otf
new file mode 120000
index 0000000..ff9ae6e
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSansCondensed-Italic.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSansCondensed-Italic.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSansCondensed-Light.otf b/theme/src/main/assets/fonts/FiraSansCondensed-Light.otf
new file mode 120000
index 0000000..c522071
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSansCondensed-Light.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSansCondensed-Light.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSansCondensed-LightItalic.otf b/theme/src/main/assets/fonts/FiraSansCondensed-LightItalic.otf
new file mode 120000
index 0000000..543b50b
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSansCondensed-LightItalic.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSansCondensed-LightItalic.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSansCondensed-Medium.otf b/theme/src/main/assets/fonts/FiraSansCondensed-Medium.otf
new file mode 120000
index 0000000..2c0bbd0
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSansCondensed-Medium.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSansCondensed-Medium.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSansCondensed-MediumItalic.otf b/theme/src/main/assets/fonts/FiraSansCondensed-MediumItalic.otf
new file mode 120000
index 0000000..dfde644
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSansCondensed-MediumItalic.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSansCondensed-MediumItalic.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSansCondensed-Regular.otf b/theme/src/main/assets/fonts/FiraSansCondensed-Regular.otf
new file mode 120000
index 0000000..b6f0945
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSansCondensed-Regular.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSansCondensed-Regular.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSansCondensed-SemiBold.otf b/theme/src/main/assets/fonts/FiraSansCondensed-SemiBold.otf
new file mode 120000
index 0000000..d47ac63
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSansCondensed-SemiBold.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSansCondensed-SemiBold.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSansCondensed-SemiboldItalic.otf b/theme/src/main/assets/fonts/FiraSansCondensed-SemiboldItalic.otf
new file mode 120000
index 0000000..60a74dc
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSansCondensed-SemiboldItalic.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSansCondensed-SemiboldItalic.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSansCondensed-Thin.otf b/theme/src/main/assets/fonts/FiraSansCondensed-Thin.otf
new file mode 120000
index 0000000..cbc5b86
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSansCondensed-Thin.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSansCondensed-Thin.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSansCondensed-ThinItalic.otf b/theme/src/main/assets/fonts/FiraSansCondensed-ThinItalic.otf
new file mode 120000
index 0000000..c73182e
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSansCondensed-ThinItalic.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSansCondensed-ThinItalic.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSansCondensed-Ultra.otf b/theme/src/main/assets/fonts/FiraSansCondensed-Ultra.otf
new file mode 120000
index 0000000..140f264
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSansCondensed-Ultra.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSansCondensed-Ultra.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSansCondensed-UltraItalic.otf b/theme/src/main/assets/fonts/FiraSansCondensed-UltraItalic.otf
new file mode 120000
index 0000000..cc1d37e
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSansCondensed-UltraItalic.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSansCondensed-UltraItalic.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSansCondensed-UltraLight.otf b/theme/src/main/assets/fonts/FiraSansCondensed-UltraLight.otf
new file mode 120000
index 0000000..73fc193
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSansCondensed-UltraLight.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSansCondensed-UltraLight.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/FiraSansCondensed-UltraLightItalic.otf b/theme/src/main/assets/fonts/FiraSansCondensed-UltraLightItalic.otf
new file mode 120000
index 0000000..709b5b4
--- /dev/null
+++ b/theme/src/main/assets/fonts/FiraSansCondensed-UltraLightItalic.otf
@@ -0,0 +1 @@
+../../../../../fira/otf/FiraSansCondensed-UltraLightItalic.otf
\ No newline at end of file
diff --git a/theme/src/main/assets/fonts/fonts.xml b/theme/src/main/assets/fonts/fonts.xml
index 8bc8327..154ae9a 100644
--- a/theme/src/main/assets/fonts/fonts.xml
+++ b/theme/src/main/assets/fonts/fonts.xml
@@ -2,24 +2,24 @@
 <familyset version="22">
     <!-- first font is default -->
     <family name="sans-serif">
-        <font weight="100" style="normal">FiraSans-Thin.ttf</font>
-        <font weight="100" style="italic">FiraSans-ThinItalic.ttf</font>
-        <font weight="200" style="normal">FiraSans-UltraLight.ttf</font>
-        <font weight="200" style="italic">FiraSans-UltraLightItalic.ttf</font>
-        <font weight="300" style="normal">FiraSans-Light.ttf</font>
-        <font weight="300" style="italic">FiraSans-LightItalic.ttf</font>
-        <font weight="400" style="normal">FiraSans-Regular.ttf</font>
-        <font weight="400" style="italic">FiraSans-Italic.ttf</font>
-        <font weight="500" style="normal">FiraSans-Medium.ttf</font>
-        <font weight="500" style="italic">FiraSans-MediumItalic.ttf</font>
-        <font weight="600" style="normal">FiraSans-SemiBold.ttf</font>
-        <font weight="600" style="italic">FiraSans-SemiBoldItalic.ttf</font>
-        <font weight="700" style="normal">FiraSans-Bold.ttf</font>
-        <font weight="700" style="italic">FiraSans-BoldItalic.ttf</font>
-        <font weight="800" style="normal">FiraSans-Heavy.ttf</font>
-        <font weight="800" style="italic">FiraSans-HeavyItalic.ttf</font>
-        <font weight="900" style="normal">FiraSans-Ultra.ttf</font>
-        <font weight="900" style="italic">FiraSans-UltraItalic.ttf</font>
+        <font weight="100" style="normal">FiraSans-Thin.otf</font>
+        <font weight="100" style="italic">FiraSans-ThinItalic.otf</font>
+        <font weight="200" style="normal">FiraSans-UltraLight.otf</font>
+        <font weight="200" style="italic">FiraSans-UltraLightItalic.otf</font>
+        <font weight="300" style="normal">FiraSans-Light.otf</font>
+        <font weight="300" style="italic">FiraSans-LightItalic.otf</font>
+        <font weight="400" style="normal">FiraSans-Regular.otf</font>
+        <font weight="400" style="italic">FiraSans-Italic.otf</font>
+        <font weight="500" style="normal">FiraSans-Medium.otf</font>
+        <font weight="500" style="italic">FiraSans-MediumItalic.otf</font>
+        <font weight="600" style="normal">FiraSans-SemiBold.otf</font>
+        <font weight="600" style="italic">FiraSans-SemiBoldItalic.otf</font>
+        <font weight="700" style="normal">FiraSans-Bold.otf</font>
+        <font weight="700" style="italic">FiraSans-BoldItalic.otf</font>
+        <font weight="800" style="normal">FiraSans-Heavy.otf</font>
+        <font weight="800" style="italic">FiraSans-HeavyItalic.otf</font>
+        <font weight="900" style="normal">FiraSans-Ultra.otf</font>
+        <font weight="900" style="italic">FiraSans-UltraItalic.otf</font>
     </family>
 
     <!-- Note that aliases must come after the fonts they reference. -->
@@ -32,12 +32,33 @@
     <alias name="tahoma" to="sans-serif" />
     <alias name="verdana" to="sans-serif" />
 
+    <family name="sans-serif-condensed">
+        <font weight="100" style="normal">FiraSansCondensed-Thin.otf</font>
+        <font weight="100" style="italic">FiraSansCondensed-ThinItalic.otf</font>
+        <font weight="200" style="normal">FiraSansCondensed-UltraLight.otf</font>
+        <font weight="200" style="italic">FiraSansCondensed-UltraLightItalic.otf</font>
+        <font weight="300" style="normal">FiraSansCondensed-Light.otf</font>
+        <font weight="300" style="italic">FiraSansCondensed-LightItalic.otf</font>
+        <font weight="400" style="normal">FiraSansCondensed-Regular.otf</font>
+        <font weight="400" style="italic">FiraSansCondensed-Italic.otf</font>
+        <font weight="500" style="normal">FiraSansCondensed-Medium.otf</font>
+        <font weight="500" style="italic">FiraSansCondensed-MediumItalic.otf</font>
+        <font weight="600" style="normal">FiraSansCondensed-SemiBold.otf</font>
+        <font weight="600" style="italic">FiraSansCondensed-SemiboldItalic.otf</font>
+        <font weight="700" style="normal">FiraSansCondensed-Bold.otf</font>
+        <font weight="700" style="italic">FiraSansCondensed-BoldItalic.otf</font>
+        <font weight="800" style="normal">FiraSansCondensed-Heavy.otf</font>
+        <font weight="800" style="italic">FiraSansCondensed-HeavyItalic.otf</font>
+        <font weight="900" style="normal">FiraSansCondensed-Ultra.otf</font>
+        <font weight="900" style="italic">FiraSansCondensed-UltraItalic.otf</font>
+    </family>
+
     <family name="monospace">
-        <font weight="400" style="normal">FiraMono-Regular.ttf</font>
-        <font weight="500" style="normal">FiraMono-Medium.ttf</font>
-        <font weight="700" style="normal">FiraMono-Bold.ttf</font>
+        <font weight="400" style="normal">FiraMono-Regular.otf</font>
+        <font weight="500" style="normal">FiraMono-Medium.otf</font>
+        <font weight="700" style="normal">FiraMono-Bold.otf</font>
     </family>
     <alias name="sans-serif-monospace" to="monospace" />
     <alias name="monaco" to="monospace" />
 
-</familyset>
\ No newline at end of file
+</familyset>
diff --git a/theme/src/main/res/drawable-hdpi/ic_launcher.png b/theme/src/main/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000..9ea2028
Binary files /dev/null and b/theme/src/main/res/drawable-hdpi/ic_launcher.png differ
diff --git a/theme/src/main/res/drawable-mdpi/ic_launcher.png b/theme/src/main/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000..6faae12
Binary files /dev/null and b/theme/src/main/res/drawable-mdpi/ic_launcher.png differ