diff --git a/theme/neo/README b/theme/neo/README
index 42e1b4763c..9e001123cb 100644
--- a/theme/neo/README
+++ b/theme/neo/README
@@ -4,3 +4,7 @@ http://www.openclipart.org/detail/34957
Icons by Mark James
http://www.famfamfam.com/lab/icons/silk/
http://creativecommons.org/licenses/by/2.5/ Creative Commons Attribution 2.5 License
+
+Lato font by Łukasz Dziedzic (http://www.typoland.com) via Google Web Fonts (http://www.google.com/webfonts)
+SIL Open Font License, 1.1 (http://scripts.sil.org/OFL)
+Prepared for web with Font Squirrel (http://www.fontsquirrel.com/fontface/generator)
diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index 13e03af710..f9ee0e51a7 100644
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -7,6 +7,26 @@
* @link http://status.net/
*/
+@font-face {
+ font-family: 'Lato';
+ src: url('../fonts/lato-regular-webfont.eot?') format('eot'), url('../fonts/lato-regular-webfont.woff') format('woff'), url('../fonts/lato-regular-webfont.ttf') format('truetype'), url('../fonts/lato-regular-webfont.svg#webfontCjmEHx3G') format('svg');
+ font-weight: normal;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'Lato';
+ src: url('../fonts/lato-bold-webfont.eot?') format('eot'), url('../fonts/lato-bold-webfont.woff') format('woff'), url('../fonts/lato-bold-webfont.ttf') format('truetype'), url('../fonts/lato-bold-webfont.svg#webfontCjmEHx3G') format('svg');
+ font-weight: bold;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'Lato';
+ src: url('../fonts/lato-italic-webfont.eot?') format('eot'), url('../fonts/lato-italic-webfont.woff') format('woff'), url('../fonts/lato-italic-webfont.ttf') format('truetype'), url('../fonts/lato-italic-webfont.svg#webfontCjmEHx3G') format('svg');
+ font-weight: normal;
+ font-style: italic;
+}
@media screen, projection, tv {
diff --git a/theme/neo/fonts/lato-bold-webfont.eot b/theme/neo/fonts/lato-bold-webfont.eot
new file mode 100644
index 0000000000..311969480a
Binary files /dev/null and b/theme/neo/fonts/lato-bold-webfont.eot differ
diff --git a/theme/neo/fonts/lato-bold-webfont.svg b/theme/neo/fonts/lato-bold-webfont.svg
new file mode 100644
index 0000000000..90e8e2551b
--- /dev/null
+++ b/theme/neo/fonts/lato-bold-webfont.svg
@@ -0,0 +1,297 @@
+
+
+
\ No newline at end of file
diff --git a/theme/neo/fonts/lato-bold-webfont.ttf b/theme/neo/fonts/lato-bold-webfont.ttf
new file mode 100644
index 0000000000..c947e75994
Binary files /dev/null and b/theme/neo/fonts/lato-bold-webfont.ttf differ
diff --git a/theme/neo/fonts/lato-bold-webfont.woff b/theme/neo/fonts/lato-bold-webfont.woff
new file mode 100644
index 0000000000..cd9fe13a48
Binary files /dev/null and b/theme/neo/fonts/lato-bold-webfont.woff differ
diff --git a/theme/neo/fonts/lato-italic-webfont.eot b/theme/neo/fonts/lato-italic-webfont.eot
new file mode 100644
index 0000000000..d9d4e43712
Binary files /dev/null and b/theme/neo/fonts/lato-italic-webfont.eot differ
diff --git a/theme/neo/fonts/lato-italic-webfont.svg b/theme/neo/fonts/lato-italic-webfont.svg
new file mode 100644
index 0000000000..7ddb617caf
--- /dev/null
+++ b/theme/neo/fonts/lato-italic-webfont.svg
@@ -0,0 +1,281 @@
+
+
+
\ No newline at end of file
diff --git a/theme/neo/fonts/lato-italic-webfont.ttf b/theme/neo/fonts/lato-italic-webfont.ttf
new file mode 100644
index 0000000000..cf9a5bea2a
Binary files /dev/null and b/theme/neo/fonts/lato-italic-webfont.ttf differ
diff --git a/theme/neo/fonts/lato-italic-webfont.woff b/theme/neo/fonts/lato-italic-webfont.woff
new file mode 100644
index 0000000000..3ecbe77d74
Binary files /dev/null and b/theme/neo/fonts/lato-italic-webfont.woff differ
diff --git a/theme/neo/fonts/lato-regular-webfont.eot b/theme/neo/fonts/lato-regular-webfont.eot
new file mode 100644
index 0000000000..d41c3ede27
Binary files /dev/null and b/theme/neo/fonts/lato-regular-webfont.eot differ
diff --git a/theme/neo/fonts/lato-regular-webfont.svg b/theme/neo/fonts/lato-regular-webfont.svg
new file mode 100644
index 0000000000..fa811af1b8
--- /dev/null
+++ b/theme/neo/fonts/lato-regular-webfont.svg
@@ -0,0 +1,297 @@
+
+
+
\ No newline at end of file
diff --git a/theme/neo/fonts/lato-regular-webfont.ttf b/theme/neo/fonts/lato-regular-webfont.ttf
new file mode 100644
index 0000000000..f77cd55f3e
Binary files /dev/null and b/theme/neo/fonts/lato-regular-webfont.ttf differ
diff --git a/theme/neo/fonts/lato-regular-webfont.woff b/theme/neo/fonts/lato-regular-webfont.woff
new file mode 100644
index 0000000000..8995dc4fd0
Binary files /dev/null and b/theme/neo/fonts/lato-regular-webfont.woff differ
diff --git a/theme/neo/fonts/stylesheet.css b/theme/neo/fonts/stylesheet.css
new file mode 100644
index 0000000000..f913fc6621
--- /dev/null
+++ b/theme/neo/fonts/stylesheet.css
@@ -0,0 +1,26 @@
+/* Generated by Font Squirrel (http://www.fontsquirrel.com) on April 14, 2011 */
+
+@font-face {
+ font-family: 'LatoBold';
+ src: url('lato-bold-webfont.eot');
+ src: local('☺'), url('lato-bold-webfont.woff') format('woff'), url('lato-bold-webfont.ttf') format('truetype'), url('lato-bold-webfont.svg#webfontRFDbyVDk') format('svg');
+ font-weight: normal;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'LatoItalic';
+ src: url('lato-italic-webfont.eot');
+ src: local('☺'), url('lato-italic-webfont.woff') format('woff'), url('lato-italic-webfont.ttf') format('truetype'), url('lato-italic-webfont.svg#webfont7qSu1Vfu') format('svg');
+ font-weight: normal;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'LatoRegular';
+ src: url('lato-regular-webfont.eot');
+ src: local('☺'), url('lato-regular-webfont.woff') format('woff'), url('lato-regular-webfont.ttf') format('truetype'), url('lato-regular-webfont.svg#webfontCjmEHx3G') format('svg');
+ font-weight: normal;
+ font-style: normal;
+}
+
diff --git a/theme/neo/theme.ini b/theme/neo/theme.ini
index 595c391fa7..33d0b67978 100644
--- a/theme/neo/theme.ini
+++ b/theme/neo/theme.ini
@@ -1,2 +1 @@
-external[]="http://fonts.googleapis.com/css?family=Lato:100,100italic,300,300italic,400,400italic,700,700italic,900,900italic"
include=base