diff --git a/maubot/management/frontend/public/fonts/FiraCode@1.206/fira_code.css b/maubot/management/frontend/public/fonts/FiraCode@1.206/fira_code.css
deleted file mode 100644
index 1e872d7..0000000
--- a/maubot/management/frontend/public/fonts/FiraCode@1.206/fira_code.css
+++ /dev/null
@@ -1,28 +0,0 @@
-@font-face{
- font-family: 'Fira Code';
- src: url('woff2/FiraCode-Light.woff2') format('woff2');
- font-weight: 300;
- font-style: normal;
-}
-
-@font-face{
- font-family: 'Fira Code';
- src: url('eot/FiraCode-Regular.eot');
- src: url('woff2/FiraCode-Regular.woff2') format('woff2');
- font-weight: 400;
- font-style: normal;
-}
-
-@font-face{
- font-family: 'Fira Code';
- src: url('woff2/FiraCode-Medium.woff2') format('woff2');
- font-weight: 500;
- font-style: normal;
-}
-
-@font-face{
- font-family: 'Fira Code';
- src: url('woff2/FiraCode-Bold.woff2') format('woff2'),
- font-weight: 700;
- font-style: normal;
-}
diff --git a/maubot/management/frontend/public/fonts/FiraCode@1.206/woff2/FiraCode-Light.woff2 b/maubot/management/frontend/public/fonts/FiraCode@1.206/woff2/FiraCode-Light.woff2
deleted file mode 100644
index 82c9850..0000000
Binary files a/maubot/management/frontend/public/fonts/FiraCode@1.206/woff2/FiraCode-Light.woff2 and /dev/null differ
diff --git a/maubot/management/frontend/public/fonts/FiraCode@1.206/woff2/FiraCode-Medium.woff2 b/maubot/management/frontend/public/fonts/FiraCode@1.206/woff2/FiraCode-Medium.woff2
deleted file mode 100644
index 8f58744..0000000
Binary files a/maubot/management/frontend/public/fonts/FiraCode@1.206/woff2/FiraCode-Medium.woff2 and /dev/null differ
diff --git a/maubot/management/frontend/public/fonts/raleway/raleway.css b/maubot/management/frontend/public/fonts/raleway/raleway.css
deleted file mode 100644
index 4ae65f8..0000000
--- a/maubot/management/frontend/public/fonts/raleway/raleway.css
+++ /dev/null
@@ -1,26 +0,0 @@
-/* raleway-300 - latin */
-@font-face {
- font-family: 'Raleway';
- font-style: normal;
- font-weight: 300;
- src: local('Raleway Light'), local('Raleway-Light'),
- url('raleway-v13-latin-300.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-}
-
-/* raleway-regular - latin */
-@font-face {
- font-family: 'Raleway';
- font-style: normal;
- font-weight: 400;
- src: local('Raleway'), local('Raleway-Regular'),
- url('raleway-v13-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-}
-
-/* raleway-700 - latin */
-@font-face {
- font-family: 'Raleway';
- font-style: normal;
- font-weight: 700;
- src: local('Raleway Bold'), local('Raleway-Bold'),
- url('raleway-v13-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-}
diff --git a/maubot/management/frontend/public/index.html b/maubot/management/frontend/public/index.html
index fd11c6b..1beecf9 100644
--- a/maubot/management/frontend/public/index.html
+++ b/maubot/management/frontend/public/index.html
@@ -20,12 +20,11 @@ along with this program. If not, see .
-
-
+
+
+
Maubot Manager
diff --git a/maubot/management/frontend/public/fonts/FiraCode@1.206/woff2/FiraCode-Bold.woff2 b/maubot/management/frontend/src/fonts/firacode-bold.woff2
similarity index 100%
rename from maubot/management/frontend/public/fonts/FiraCode@1.206/woff2/FiraCode-Bold.woff2
rename to maubot/management/frontend/src/fonts/firacode-bold.woff2
diff --git a/maubot/management/frontend/public/fonts/FiraCode@1.206/woff2/FiraCode-Regular.woff2 b/maubot/management/frontend/src/fonts/firacode-regular.woff2
similarity index 100%
rename from maubot/management/frontend/public/fonts/FiraCode@1.206/woff2/FiraCode-Regular.woff2
rename to maubot/management/frontend/src/fonts/firacode-regular.woff2
diff --git a/maubot/management/frontend/public/fonts/raleway/raleway-v13-latin-700.woff2 b/maubot/management/frontend/src/fonts/raleway-bold.woff2
similarity index 100%
rename from maubot/management/frontend/public/fonts/raleway/raleway-v13-latin-700.woff2
rename to maubot/management/frontend/src/fonts/raleway-bold.woff2
diff --git a/maubot/management/frontend/public/fonts/raleway/raleway-v13-latin-300.woff2 b/maubot/management/frontend/src/fonts/raleway-light.woff2
similarity index 100%
rename from maubot/management/frontend/public/fonts/raleway/raleway-v13-latin-300.woff2
rename to maubot/management/frontend/src/fonts/raleway-light.woff2
diff --git a/maubot/management/frontend/public/fonts/raleway/raleway-v13-latin-regular.woff2 b/maubot/management/frontend/src/fonts/raleway-regular.woff2
similarity index 100%
rename from maubot/management/frontend/public/fonts/raleway/raleway-v13-latin-regular.woff2
rename to maubot/management/frontend/src/fonts/raleway-regular.woff2
diff --git a/maubot/management/frontend/src/style/base/fonts.sass b/maubot/management/frontend/src/style/base/fonts.sass
new file mode 100644
index 0000000..48875e5
--- /dev/null
+++ b/maubot/management/frontend/src/style/base/fonts.sass
@@ -0,0 +1,30 @@
+@font-face
+ font-family: 'Raleway'
+ font-style: normal
+ font-weight: 300
+ src: local('Raleway Light'), local('Raleway-Light'), url('../fonts/raleway-light.woff2') format('woff2')
+
+@font-face
+ font-family: 'Raleway'
+ font-style: normal
+ font-weight: 400
+ src: local('Raleway'), local('Raleway-Regular'), url('../fonts/raleway-regular.woff2') format('woff2')
+
+@font-face
+ font-family: 'Raleway'
+ font-style: normal
+ font-weight: 700
+ src: local('Raleway Bold'), local('Raleway-Bold'), url('../fonts/raleway-bold.woff2') format('woff2')
+
+
+@font-face
+ font-family: 'Fira Code'
+ src: url('../fonts/firacode-regular.woff2') format('woff2')
+ font-weight: 400
+ font-style: normal
+
+@font-face
+ font-family: 'Fira Code'
+ src: url('../fonts/firacode-bold.woff2') format('woff2')
+ font-weight: 700
+ font-style: normal
diff --git a/maubot/management/frontend/src/style/index.sass b/maubot/management/frontend/src/style/index.sass
index d7b702d..9b08813 100644
--- a/maubot/management/frontend/src/style/index.sass
+++ b/maubot/management/frontend/src/style/index.sass
@@ -16,6 +16,7 @@
@import lib/spinner
@import lib/contextmenu
+@import base/fonts
@import base/vars
@import base/body
@import base/elements