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 120000
index dd760ea..0000000
--- a/theme/src/main/assets/fonts/FiraMono-Bold.ttf
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../fira/ttf/FiraMono-Bold.ttf
\ No newline at end of file
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 120000
index 3c5f438..0000000
--- a/theme/src/main/assets/fonts/FiraMono-Medium.ttf
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../fira/ttf/FiraMono-Medium.ttf
\ No newline at end of file
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 120000
index 603b8e4..0000000
--- a/theme/src/main/assets/fonts/FiraMono-Regular.ttf
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../fira/ttf/FiraMono-Regular.ttf
\ No newline at end of file
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 120000
index e8ebd1f..0000000
--- a/theme/src/main/assets/fonts/FiraSans-Bold.ttf
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../fira/ttf/FiraSans-Bold.ttf
\ No newline at end of file
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 120000
index de202e6..0000000
--- a/theme/src/main/assets/fonts/FiraSans-BoldItalic.ttf
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../fira/ttf/FiraSans-BoldItalic.ttf
\ No newline at end of file
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 120000
index 2f150fb..0000000
--- a/theme/src/main/assets/fonts/FiraSans-Heavy.ttf
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../fira/ttf/FiraSans-Heavy.ttf
\ No newline at end of file
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 120000
index 8f1d6ae..0000000
--- a/theme/src/main/assets/fonts/FiraSans-HeavyItalic.ttf
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../fira/ttf/FiraSans-HeavyItalic.ttf
\ No newline at end of file
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 120000
index 9564003..0000000
--- a/theme/src/main/assets/fonts/FiraSans-Italic.ttf
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../fira/ttf/FiraSans-Italic.ttf
\ No newline at end of file
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 120000
index 859eb73..0000000
--- a/theme/src/main/assets/fonts/FiraSans-Light.ttf
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../fira/ttf/FiraSans-Light.ttf
\ No newline at end of file
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 120000
index 8251ccc..0000000
--- a/theme/src/main/assets/fonts/FiraSans-LightItalic.ttf
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../fira/ttf/FiraSans-LightItalic.ttf
\ No newline at end of file
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 120000
index 61c5d30..0000000
--- a/theme/src/main/assets/fonts/FiraSans-Medium.ttf
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../fira/ttf/FiraSans-Medium.ttf
\ No newline at end of file
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 120000
index 39e5c9e..0000000
--- a/theme/src/main/assets/fonts/FiraSans-MediumItalic.ttf
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../fira/ttf/FiraSans-MediumItalic.ttf
\ No newline at end of file
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 120000
index 671f520..0000000
--- a/theme/src/main/assets/fonts/FiraSans-Regular.ttf
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../fira/ttf/FiraSans-Regular.ttf
\ No newline at end of file
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 120000
index 4b16624..0000000
--- a/theme/src/main/assets/fonts/FiraSans-SemiBold.ttf
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../fira/ttf/FiraSans-SemiBold.ttf
\ No newline at end of file
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 120000
index ae35e69..0000000
--- a/theme/src/main/assets/fonts/FiraSans-SemiBoldItalic.ttf
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../fira/ttf/FiraSans-SemiBoldItalic.ttf
\ No newline at end of file
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 120000
index 4cbab52..0000000
--- a/theme/src/main/assets/fonts/FiraSans-Thin.ttf
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../fira/ttf/FiraSans-Thin.ttf
\ No newline at end of file
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 120000
index 684ecaa..0000000
--- a/theme/src/main/assets/fonts/FiraSans-ThinItalic.ttf
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../fira/ttf/FiraSans-ThinItalic.ttf
\ No newline at end of file
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 120000
index ef508f1..0000000
--- a/theme/src/main/assets/fonts/FiraSans-Ultra.ttf
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../fira/ttf/FiraSans-Ultra.ttf
\ No newline at end of file
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 120000
index 8b57d95..0000000
--- a/theme/src/main/assets/fonts/FiraSans-UltraItalic.ttf
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../fira/ttf/FiraSans-UltraItalic.ttf
\ No newline at end of file
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 120000
index 9cdab31..0000000
--- a/theme/src/main/assets/fonts/FiraSans-UltraLight.ttf
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../fira/ttf/FiraSans-UltraLight.ttf
\ No newline at end of file
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 120000
index 115c5df..0000000
--- a/theme/src/main/assets/fonts/FiraSans-UltraLightItalic.ttf
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../fira/ttf/FiraSans-UltraLightItalic.ttf
\ 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..eb8e763 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. -->
@@ -33,11 +33,11 @@
     <alias name="verdana" to="sans-serif" />
 
     <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>