diff --git a/res/static/misc/Lato-Hairline.ttf b/res/static/misc/Lato-Hairline.ttf
new file mode 100644
index 0000000..a7365b8
Binary files /dev/null and b/res/static/misc/Lato-Hairline.ttf differ
diff --git a/res/static/misc/Lato.woff2 b/res/static/misc/Lato.woff2
deleted file mode 100644
index 9cfc8c5..0000000
Binary files a/res/static/misc/Lato.woff2 and /dev/null differ
diff --git a/res/static/misc/Ubuntu.woff2 b/res/static/misc/Ubuntu.woff2
deleted file mode 100644
index a9880d6..0000000
Binary files a/res/static/misc/Ubuntu.woff2 and /dev/null differ
diff --git a/res/static/style/layout.css b/res/static/style/layout.css
index 35735ee..0939a09 100644
--- a/res/static/style/layout.css
+++ b/res/static/style/layout.css
@@ -13,14 +13,13 @@
 	font-family: 'Ubuntu';
 	font-style: normal;
 	font-weight: 400;
-	src: local('Ubuntu Regular'), local('Ubuntu-Regular'), local('Ubuntu'), url(/res/misc/Ubuntu-R.ttf) format('ttf');
-	unicode-range: U+0000-FFFF;
+	src: local('Ubuntu Regular'), local('Ubuntu-Regular'), local('Ubuntu'), url(/res/misc/Ubuntu-R.ttf) format('truetype');
 }
 @font-face {
 	font-family: 'Lato';
 	font-style: normal;
 	font-weight: 100;
-	src: local('Lato Hairline'), local('Lato-Hairline'), url(/res/misc/Lato.woff2) format('woff2');
+	src: local('Lato Hairline'), local('Lato-Hairline'), url(/res/misc/Lato-Hairline.ttf) format('truetype');
 }
 
 /* Page rendering configuration */
diff --git a/res/template/file_viewer.html b/res/template/file_viewer.html
index 7ce1f52..628dccb 100644
--- a/res/template/file_viewer.html
+++ b/res/template/file_viewer.html
@@ -9,13 +9,10 @@
 		<link rel="stylesheet" href="/res/style/viewer.css"/>
 		<link rel="stylesheet" href="/res/style/layout.css"/>
 		<link rel="stylesheet" href="/res/style/listview.css"/>
-		<link href='https://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css'/>
 		<link rel="shortcut icon" href="/res/img/tray32.png"/>
 		<link rel="icon" sizes="180x180" href="/res/img/pixeldrain.png"/>
 		<link rel="icon" sizes="256x256" href="/res/img/pixeldrain_big.png"/>
 
-		<link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/themes/smoothness/jquery-ui.css"/>
-
 		<!-- <link rel="alternate" type="application/json+oembed" th:href="*{oEmbedHref}" th:title="*{ogTitle}" /> OEmbed will return soon -->
 
 		{{template "bgpattern"}}
@@ -170,7 +167,6 @@
 		</div>
 
 		<script src="/res/script/jquery.js"></script>
-		<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"></script>
 		<script src="/res/script/Keyboard.js"></script>
 		<script src="/res/script/Toolbar.js"></script>
 		<script src="/res/script/Sharebar.js"></script>
diff --git a/res/template/file_viewer_embed.html b/res/template/file_viewer_embed.html
index afd44f9..c05e418 100644
--- a/res/template/file_viewer_embed.html
+++ b/res/template/file_viewer_embed.html
@@ -7,19 +7,18 @@
 		<link rel="stylesheet" href="/res/style/viewer_embed.css"/>
 		<link rel="stylesheet" href="/res/style/season.css"/>
 		<link rel="stylesheet" href="/res/style/listview_embed.css"/>
-		<link href='https://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css'/>
 		<link rel="shortcut icon" href="/res/img/tray32.png"/>
 		<meta name="theme-color" content="#9FCF6C"/>
 		<link rel="icon" sizes="180x180" href="/res/img/pixeldrain.png"/>
 		<link rel="icon" sizes="256x256" href="/res/img/pixeldrain_big.png"/>
-		
+
 		<style th:include="fragments :: background-pattern" th:inline="text"></style>
-		
+
 		<script src="/res/script/jquery-2.1.4.min.js"></script>
 		<link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/themes/smoothness/jquery-ui.css"/>
 
 		<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"></script>
-		
+
 		<meta name="twitter:creator" content="@Fornax96" />
 		<meta property="og:title" th:content="*{ogTitle}" />
 		<meta property="og:type" th:content="*{ogType}" />
@@ -38,11 +37,11 @@
 			<img src="/res/img/arrow-right.png" id="arrow-right" alt="Next Item" onClick="ListNavigator.nextItem();" />
 			<div id="listNavigatorItems"></div>
 		</div>
-		
+
 		<div id="filepreview">
 			Loading...
 		</div>
-		
+
 		<script src="/res/script/jquery-2.1.4.min.js"></script>
 		<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"></script>
 		<script src="/res/script/Keyboard.js"></script>
@@ -51,13 +50,13 @@
 		<script src="/res/script/DetailsWindow.js"></script>
 		<script src="/res/script/Viewer.js"></script>
 		<script src="/res/script/ListNavigator.js"></script>
-		
+
 		<script th:inline="javascript">
 			// This info gets filled in on the server side to prevent having to make an API call right after the page loads.
 			// Just to slice another few milliseconds from the load time :)
 			Viewer.init([[${type}]], [[${id}]], [[${data}]]);
 		</script>
-		
+
 		<!-- Google Analytics Tracking code -->
 		<script>
 			(function (i, s, o, g, r, a, m) {
@@ -76,4 +75,4 @@
 			ga('send', 'pageview');
 		</script>
 	</body>
-</html>
\ No newline at end of file
+</html>