diff --git a/umap/static/umap/font/FiraSans-Bold.eot b/umap/static/umap/font/FiraSans-Bold.eot
new file mode 100644
index 00000000..07323b60
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Bold.eot differ
diff --git a/umap/static/umap/font/FiraSans-Bold.ttf b/umap/static/umap/font/FiraSans-Bold.ttf
new file mode 100644
index 00000000..093503b4
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Bold.ttf differ
diff --git a/umap/static/umap/font/FiraSans-Bold.woff b/umap/static/umap/font/FiraSans-Bold.woff
new file mode 100644
index 00000000..ebc183ee
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Bold.woff differ
diff --git a/umap/static/umap/font/FiraSans-BoldItalic.eot b/umap/static/umap/font/FiraSans-BoldItalic.eot
new file mode 100644
index 00000000..1600c30c
Binary files /dev/null and b/umap/static/umap/font/FiraSans-BoldItalic.eot differ
diff --git a/umap/static/umap/font/FiraSans-BoldItalic.ttf b/umap/static/umap/font/FiraSans-BoldItalic.ttf
new file mode 100644
index 00000000..dd5120e3
Binary files /dev/null and b/umap/static/umap/font/FiraSans-BoldItalic.ttf differ
diff --git a/umap/static/umap/font/FiraSans-BoldItalic.woff b/umap/static/umap/font/FiraSans-BoldItalic.woff
new file mode 100644
index 00000000..51b9f839
Binary files /dev/null and b/umap/static/umap/font/FiraSans-BoldItalic.woff differ
diff --git a/umap/static/umap/font/FiraSans-Book.eot b/umap/static/umap/font/FiraSans-Book.eot
new file mode 100644
index 00000000..ef80967e
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Book.eot differ
diff --git a/umap/static/umap/font/FiraSans-Book.ttf b/umap/static/umap/font/FiraSans-Book.ttf
new file mode 100644
index 00000000..915e5499
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Book.ttf differ
diff --git a/umap/static/umap/font/FiraSans-Book.woff b/umap/static/umap/font/FiraSans-Book.woff
new file mode 100644
index 00000000..10e43776
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Book.woff differ
diff --git a/umap/static/umap/font/FiraSans-BookItalic.eot b/umap/static/umap/font/FiraSans-BookItalic.eot
new file mode 100644
index 00000000..49847530
Binary files /dev/null and b/umap/static/umap/font/FiraSans-BookItalic.eot differ
diff --git a/umap/static/umap/font/FiraSans-BookItalic.ttf b/umap/static/umap/font/FiraSans-BookItalic.ttf
new file mode 100644
index 00000000..bab6d34d
Binary files /dev/null and b/umap/static/umap/font/FiraSans-BookItalic.ttf differ
diff --git a/umap/static/umap/font/FiraSans-BookItalic.woff b/umap/static/umap/font/FiraSans-BookItalic.woff
new file mode 100644
index 00000000..e215a55f
Binary files /dev/null and b/umap/static/umap/font/FiraSans-BookItalic.woff differ
diff --git a/umap/static/umap/font/FiraSans-Eight.eot b/umap/static/umap/font/FiraSans-Eight.eot
new file mode 100644
index 00000000..ca28fb0e
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Eight.eot differ
diff --git a/umap/static/umap/font/FiraSans-Eight.ttf b/umap/static/umap/font/FiraSans-Eight.ttf
new file mode 100644
index 00000000..4940d7de
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Eight.ttf differ
diff --git a/umap/static/umap/font/FiraSans-Eight.woff b/umap/static/umap/font/FiraSans-Eight.woff
new file mode 100644
index 00000000..5eb01b72
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Eight.woff differ
diff --git a/umap/static/umap/font/FiraSans-EightItalic.eot b/umap/static/umap/font/FiraSans-EightItalic.eot
new file mode 100644
index 00000000..38d93b21
Binary files /dev/null and b/umap/static/umap/font/FiraSans-EightItalic.eot differ
diff --git a/umap/static/umap/font/FiraSans-EightItalic.ttf b/umap/static/umap/font/FiraSans-EightItalic.ttf
new file mode 100644
index 00000000..6e90509b
Binary files /dev/null and b/umap/static/umap/font/FiraSans-EightItalic.ttf differ
diff --git a/umap/static/umap/font/FiraSans-EightItalic.woff b/umap/static/umap/font/FiraSans-EightItalic.woff
new file mode 100644
index 00000000..ab54cb30
Binary files /dev/null and b/umap/static/umap/font/FiraSans-EightItalic.woff differ
diff --git a/umap/static/umap/font/FiraSans-ExtraBold.eot b/umap/static/umap/font/FiraSans-ExtraBold.eot
new file mode 100644
index 00000000..a5f0ac8a
Binary files /dev/null and b/umap/static/umap/font/FiraSans-ExtraBold.eot differ
diff --git a/umap/static/umap/font/FiraSans-ExtraBold.ttf b/umap/static/umap/font/FiraSans-ExtraBold.ttf
new file mode 100644
index 00000000..d29854bc
Binary files /dev/null and b/umap/static/umap/font/FiraSans-ExtraBold.ttf differ
diff --git a/umap/static/umap/font/FiraSans-ExtraBold.woff b/umap/static/umap/font/FiraSans-ExtraBold.woff
new file mode 100644
index 00000000..5d98d85c
Binary files /dev/null and b/umap/static/umap/font/FiraSans-ExtraBold.woff differ
diff --git a/umap/static/umap/font/FiraSans-ExtraBoldItalic.eot b/umap/static/umap/font/FiraSans-ExtraBoldItalic.eot
new file mode 100644
index 00000000..b3331278
Binary files /dev/null and b/umap/static/umap/font/FiraSans-ExtraBoldItalic.eot differ
diff --git a/umap/static/umap/font/FiraSans-ExtraBoldItalic.ttf b/umap/static/umap/font/FiraSans-ExtraBoldItalic.ttf
new file mode 100644
index 00000000..0f6d3c00
Binary files /dev/null and b/umap/static/umap/font/FiraSans-ExtraBoldItalic.ttf differ
diff --git a/umap/static/umap/font/FiraSans-ExtraBoldItalic.woff b/umap/static/umap/font/FiraSans-ExtraBoldItalic.woff
new file mode 100644
index 00000000..1623d62c
Binary files /dev/null and b/umap/static/umap/font/FiraSans-ExtraBoldItalic.woff differ
diff --git a/umap/static/umap/font/FiraSans-ExtraLight.eot b/umap/static/umap/font/FiraSans-ExtraLight.eot
new file mode 100644
index 00000000..6aca60bc
Binary files /dev/null and b/umap/static/umap/font/FiraSans-ExtraLight.eot differ
diff --git a/umap/static/umap/font/FiraSans-ExtraLight.ttf b/umap/static/umap/font/FiraSans-ExtraLight.ttf
new file mode 100644
index 00000000..88e44dde
Binary files /dev/null and b/umap/static/umap/font/FiraSans-ExtraLight.ttf differ
diff --git a/umap/static/umap/font/FiraSans-ExtraLight.woff b/umap/static/umap/font/FiraSans-ExtraLight.woff
new file mode 100644
index 00000000..90e5fdf7
Binary files /dev/null and b/umap/static/umap/font/FiraSans-ExtraLight.woff differ
diff --git a/umap/static/umap/font/FiraSans-ExtraLightItalic.eot b/umap/static/umap/font/FiraSans-ExtraLightItalic.eot
new file mode 100644
index 00000000..e0022004
Binary files /dev/null and b/umap/static/umap/font/FiraSans-ExtraLightItalic.eot differ
diff --git a/umap/static/umap/font/FiraSans-ExtraLightItalic.ttf b/umap/static/umap/font/FiraSans-ExtraLightItalic.ttf
new file mode 100644
index 00000000..531723e6
Binary files /dev/null and b/umap/static/umap/font/FiraSans-ExtraLightItalic.ttf differ
diff --git a/umap/static/umap/font/FiraSans-ExtraLightItalic.woff b/umap/static/umap/font/FiraSans-ExtraLightItalic.woff
new file mode 100644
index 00000000..8fb2b01b
Binary files /dev/null and b/umap/static/umap/font/FiraSans-ExtraLightItalic.woff differ
diff --git a/umap/static/umap/font/FiraSans-Four.eot b/umap/static/umap/font/FiraSans-Four.eot
new file mode 100644
index 00000000..d27db4e3
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Four.eot differ
diff --git a/umap/static/umap/font/FiraSans-Four.ttf b/umap/static/umap/font/FiraSans-Four.ttf
new file mode 100644
index 00000000..958174ad
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Four.ttf differ
diff --git a/umap/static/umap/font/FiraSans-Four.woff b/umap/static/umap/font/FiraSans-Four.woff
new file mode 100644
index 00000000..782a04a7
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Four.woff differ
diff --git a/umap/static/umap/font/FiraSans-FourItalic.eot b/umap/static/umap/font/FiraSans-FourItalic.eot
new file mode 100644
index 00000000..e3d484b2
Binary files /dev/null and b/umap/static/umap/font/FiraSans-FourItalic.eot differ
diff --git a/umap/static/umap/font/FiraSans-FourItalic.ttf b/umap/static/umap/font/FiraSans-FourItalic.ttf
new file mode 100644
index 00000000..3f556598
Binary files /dev/null and b/umap/static/umap/font/FiraSans-FourItalic.ttf differ
diff --git a/umap/static/umap/font/FiraSans-FourItalic.woff b/umap/static/umap/font/FiraSans-FourItalic.woff
new file mode 100644
index 00000000..86bd358d
Binary files /dev/null and b/umap/static/umap/font/FiraSans-FourItalic.woff differ
diff --git a/umap/static/umap/font/FiraSans-Hair.eot b/umap/static/umap/font/FiraSans-Hair.eot
new file mode 100644
index 00000000..c7050f54
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Hair.eot differ
diff --git a/umap/static/umap/font/FiraSans-Hair.ttf b/umap/static/umap/font/FiraSans-Hair.ttf
new file mode 100644
index 00000000..5c322877
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Hair.ttf differ
diff --git a/umap/static/umap/font/FiraSans-Hair.woff b/umap/static/umap/font/FiraSans-Hair.woff
new file mode 100644
index 00000000..30de31f1
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Hair.woff differ
diff --git a/umap/static/umap/font/FiraSans-HairItalic.eot b/umap/static/umap/font/FiraSans-HairItalic.eot
new file mode 100644
index 00000000..5957c8e6
Binary files /dev/null and b/umap/static/umap/font/FiraSans-HairItalic.eot differ
diff --git a/umap/static/umap/font/FiraSans-HairItalic.ttf b/umap/static/umap/font/FiraSans-HairItalic.ttf
new file mode 100644
index 00000000..f604ab94
Binary files /dev/null and b/umap/static/umap/font/FiraSans-HairItalic.ttf differ
diff --git a/umap/static/umap/font/FiraSans-HairItalic.woff b/umap/static/umap/font/FiraSans-HairItalic.woff
new file mode 100644
index 00000000..22a380cc
Binary files /dev/null and b/umap/static/umap/font/FiraSans-HairItalic.woff differ
diff --git a/umap/static/umap/font/FiraSans-Heavy.eot b/umap/static/umap/font/FiraSans-Heavy.eot
new file mode 100644
index 00000000..f5378e41
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Heavy.eot differ
diff --git a/umap/static/umap/font/FiraSans-Heavy.ttf b/umap/static/umap/font/FiraSans-Heavy.ttf
new file mode 100644
index 00000000..6afcaf5c
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Heavy.ttf differ
diff --git a/umap/static/umap/font/FiraSans-Heavy.woff b/umap/static/umap/font/FiraSans-Heavy.woff
new file mode 100644
index 00000000..44015766
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Heavy.woff differ
diff --git a/umap/static/umap/font/FiraSans-HeavyItalic.eot b/umap/static/umap/font/FiraSans-HeavyItalic.eot
new file mode 100644
index 00000000..b613e190
Binary files /dev/null and b/umap/static/umap/font/FiraSans-HeavyItalic.eot differ
diff --git a/umap/static/umap/font/FiraSans-HeavyItalic.ttf b/umap/static/umap/font/FiraSans-HeavyItalic.ttf
new file mode 100644
index 00000000..a24848d2
Binary files /dev/null and b/umap/static/umap/font/FiraSans-HeavyItalic.ttf differ
diff --git a/umap/static/umap/font/FiraSans-HeavyItalic.woff b/umap/static/umap/font/FiraSans-HeavyItalic.woff
new file mode 100644
index 00000000..bd827a09
Binary files /dev/null and b/umap/static/umap/font/FiraSans-HeavyItalic.woff differ
diff --git a/umap/static/umap/font/FiraSans-Italic.eot b/umap/static/umap/font/FiraSans-Italic.eot
new file mode 100644
index 00000000..1369626e
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Italic.eot differ
diff --git a/umap/static/umap/font/FiraSans-Italic.ttf b/umap/static/umap/font/FiraSans-Italic.ttf
new file mode 100644
index 00000000..f627c34f
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Italic.ttf differ
diff --git a/umap/static/umap/font/FiraSans-Italic.woff b/umap/static/umap/font/FiraSans-Italic.woff
new file mode 100644
index 00000000..e27b7f3b
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Italic.woff differ
diff --git a/umap/static/umap/font/FiraSans-Light.eot b/umap/static/umap/font/FiraSans-Light.eot
new file mode 100644
index 00000000..4b8c121e
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Light.eot differ
diff --git a/umap/static/umap/font/FiraSans-Light.ttf b/umap/static/umap/font/FiraSans-Light.ttf
new file mode 100644
index 00000000..a6cae2f8
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Light.ttf differ
diff --git a/umap/static/umap/font/FiraSans-Light.woff b/umap/static/umap/font/FiraSans-Light.woff
new file mode 100644
index 00000000..59837354
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Light.woff differ
diff --git a/umap/static/umap/font/FiraSans-LightItalic.eot b/umap/static/umap/font/FiraSans-LightItalic.eot
new file mode 100644
index 00000000..6d8db86c
Binary files /dev/null and b/umap/static/umap/font/FiraSans-LightItalic.eot differ
diff --git a/umap/static/umap/font/FiraSans-LightItalic.ttf b/umap/static/umap/font/FiraSans-LightItalic.ttf
new file mode 100644
index 00000000..02e2cb2b
Binary files /dev/null and b/umap/static/umap/font/FiraSans-LightItalic.ttf differ
diff --git a/umap/static/umap/font/FiraSans-LightItalic.woff b/umap/static/umap/font/FiraSans-LightItalic.woff
new file mode 100644
index 00000000..78047e8c
Binary files /dev/null and b/umap/static/umap/font/FiraSans-LightItalic.woff differ
diff --git a/umap/static/umap/font/FiraSans-Medium.eot b/umap/static/umap/font/FiraSans-Medium.eot
new file mode 100644
index 00000000..0261dc84
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Medium.eot differ
diff --git a/umap/static/umap/font/FiraSans-Medium.ttf b/umap/static/umap/font/FiraSans-Medium.ttf
new file mode 100644
index 00000000..246c77fa
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Medium.ttf differ
diff --git a/umap/static/umap/font/FiraSans-Medium.woff b/umap/static/umap/font/FiraSans-Medium.woff
new file mode 100644
index 00000000..6b4cdb36
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Medium.woff differ
diff --git a/umap/static/umap/font/FiraSans-MediumItalic.eot b/umap/static/umap/font/FiraSans-MediumItalic.eot
new file mode 100644
index 00000000..0bf02d98
Binary files /dev/null and b/umap/static/umap/font/FiraSans-MediumItalic.eot differ
diff --git a/umap/static/umap/font/FiraSans-MediumItalic.ttf b/umap/static/umap/font/FiraSans-MediumItalic.ttf
new file mode 100644
index 00000000..cc5a5972
Binary files /dev/null and b/umap/static/umap/font/FiraSans-MediumItalic.ttf differ
diff --git a/umap/static/umap/font/FiraSans-MediumItalic.woff b/umap/static/umap/font/FiraSans-MediumItalic.woff
new file mode 100644
index 00000000..e1bc9bde
Binary files /dev/null and b/umap/static/umap/font/FiraSans-MediumItalic.woff differ
diff --git a/umap/static/umap/font/FiraSans-Regular.eot b/umap/static/umap/font/FiraSans-Regular.eot
new file mode 100644
index 00000000..ab82a339
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Regular.eot differ
diff --git a/umap/static/umap/font/FiraSans-Regular.ttf b/umap/static/umap/font/FiraSans-Regular.ttf
new file mode 100644
index 00000000..76620091
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Regular.ttf differ
diff --git a/umap/static/umap/font/FiraSans-Regular.woff b/umap/static/umap/font/FiraSans-Regular.woff
new file mode 100644
index 00000000..0a82f0a1
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Regular.woff differ
diff --git a/umap/static/umap/font/FiraSans-SemiBold.eot b/umap/static/umap/font/FiraSans-SemiBold.eot
new file mode 100644
index 00000000..6efd64c4
Binary files /dev/null and b/umap/static/umap/font/FiraSans-SemiBold.eot differ
diff --git a/umap/static/umap/font/FiraSans-SemiBold.ttf b/umap/static/umap/font/FiraSans-SemiBold.ttf
new file mode 100644
index 00000000..b5208221
Binary files /dev/null and b/umap/static/umap/font/FiraSans-SemiBold.ttf differ
diff --git a/umap/static/umap/font/FiraSans-SemiBold.woff b/umap/static/umap/font/FiraSans-SemiBold.woff
new file mode 100644
index 00000000..157cd1f1
Binary files /dev/null and b/umap/static/umap/font/FiraSans-SemiBold.woff differ
diff --git a/umap/static/umap/font/FiraSans-SemiBoldItalic.eot b/umap/static/umap/font/FiraSans-SemiBoldItalic.eot
new file mode 100644
index 00000000..7959b7db
Binary files /dev/null and b/umap/static/umap/font/FiraSans-SemiBoldItalic.eot differ
diff --git a/umap/static/umap/font/FiraSans-SemiBoldItalic.ttf b/umap/static/umap/font/FiraSans-SemiBoldItalic.ttf
new file mode 100644
index 00000000..0ee25639
Binary files /dev/null and b/umap/static/umap/font/FiraSans-SemiBoldItalic.ttf differ
diff --git a/umap/static/umap/font/FiraSans-SemiBoldItalic.woff b/umap/static/umap/font/FiraSans-SemiBoldItalic.woff
new file mode 100644
index 00000000..1cfcd374
Binary files /dev/null and b/umap/static/umap/font/FiraSans-SemiBoldItalic.woff differ
diff --git a/umap/static/umap/font/FiraSans-Thin.eot b/umap/static/umap/font/FiraSans-Thin.eot
new file mode 100644
index 00000000..96cf959b
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Thin.eot differ
diff --git a/umap/static/umap/font/FiraSans-Thin.ttf b/umap/static/umap/font/FiraSans-Thin.ttf
new file mode 100644
index 00000000..805f1679
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Thin.ttf differ
diff --git a/umap/static/umap/font/FiraSans-Thin.woff b/umap/static/umap/font/FiraSans-Thin.woff
new file mode 100644
index 00000000..2181e96b
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Thin.woff differ
diff --git a/umap/static/umap/font/FiraSans-ThinItalic.eot b/umap/static/umap/font/FiraSans-ThinItalic.eot
new file mode 100644
index 00000000..bef98b1f
Binary files /dev/null and b/umap/static/umap/font/FiraSans-ThinItalic.eot differ
diff --git a/umap/static/umap/font/FiraSans-ThinItalic.ttf b/umap/static/umap/font/FiraSans-ThinItalic.ttf
new file mode 100644
index 00000000..7ad7a7dd
Binary files /dev/null and b/umap/static/umap/font/FiraSans-ThinItalic.ttf differ
diff --git a/umap/static/umap/font/FiraSans-ThinItalic.woff b/umap/static/umap/font/FiraSans-ThinItalic.woff
new file mode 100644
index 00000000..8e19b353
Binary files /dev/null and b/umap/static/umap/font/FiraSans-ThinItalic.woff differ
diff --git a/umap/static/umap/font/FiraSans-Two.eot b/umap/static/umap/font/FiraSans-Two.eot
new file mode 100644
index 00000000..58feef34
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Two.eot differ
diff --git a/umap/static/umap/font/FiraSans-Two.ttf b/umap/static/umap/font/FiraSans-Two.ttf
new file mode 100644
index 00000000..7aaa9fef
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Two.ttf differ
diff --git a/umap/static/umap/font/FiraSans-Two.woff b/umap/static/umap/font/FiraSans-Two.woff
new file mode 100644
index 00000000..bbda3720
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Two.woff differ
diff --git a/umap/static/umap/font/FiraSans-TwoItalic.eot b/umap/static/umap/font/FiraSans-TwoItalic.eot
new file mode 100644
index 00000000..4b4688d1
Binary files /dev/null and b/umap/static/umap/font/FiraSans-TwoItalic.eot differ
diff --git a/umap/static/umap/font/FiraSans-TwoItalic.ttf b/umap/static/umap/font/FiraSans-TwoItalic.ttf
new file mode 100644
index 00000000..07b26bc7
Binary files /dev/null and b/umap/static/umap/font/FiraSans-TwoItalic.ttf differ
diff --git a/umap/static/umap/font/FiraSans-TwoItalic.woff b/umap/static/umap/font/FiraSans-TwoItalic.woff
new file mode 100644
index 00000000..97aa0ec6
Binary files /dev/null and b/umap/static/umap/font/FiraSans-TwoItalic.woff differ
diff --git a/umap/static/umap/font/FiraSans-Ultra.eot b/umap/static/umap/font/FiraSans-Ultra.eot
new file mode 100644
index 00000000..0fb4127a
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Ultra.eot differ
diff --git a/umap/static/umap/font/FiraSans-Ultra.ttf b/umap/static/umap/font/FiraSans-Ultra.ttf
new file mode 100644
index 00000000..920f91dc
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Ultra.ttf differ
diff --git a/umap/static/umap/font/FiraSans-Ultra.woff b/umap/static/umap/font/FiraSans-Ultra.woff
new file mode 100644
index 00000000..fb0a1a30
Binary files /dev/null and b/umap/static/umap/font/FiraSans-Ultra.woff differ
diff --git a/umap/static/umap/font/FiraSans-UltraItalic.eot b/umap/static/umap/font/FiraSans-UltraItalic.eot
new file mode 100644
index 00000000..4699d2af
Binary files /dev/null and b/umap/static/umap/font/FiraSans-UltraItalic.eot differ
diff --git a/umap/static/umap/font/FiraSans-UltraItalic.ttf b/umap/static/umap/font/FiraSans-UltraItalic.ttf
new file mode 100644
index 00000000..b230ea10
Binary files /dev/null and b/umap/static/umap/font/FiraSans-UltraItalic.ttf differ
diff --git a/umap/static/umap/font/FiraSans-UltraItalic.woff b/umap/static/umap/font/FiraSans-UltraItalic.woff
new file mode 100644
index 00000000..ba234d26
Binary files /dev/null and b/umap/static/umap/font/FiraSans-UltraItalic.woff differ
diff --git a/umap/static/umap/font/FiraSans-UltraLight.eot b/umap/static/umap/font/FiraSans-UltraLight.eot
new file mode 100644
index 00000000..1dcb2a9c
Binary files /dev/null and b/umap/static/umap/font/FiraSans-UltraLight.eot differ
diff --git a/umap/static/umap/font/FiraSans-UltraLight.ttf b/umap/static/umap/font/FiraSans-UltraLight.ttf
new file mode 100644
index 00000000..20fe9e0c
Binary files /dev/null and b/umap/static/umap/font/FiraSans-UltraLight.ttf differ
diff --git a/umap/static/umap/font/FiraSans-UltraLight.woff b/umap/static/umap/font/FiraSans-UltraLight.woff
new file mode 100644
index 00000000..1499c058
Binary files /dev/null and b/umap/static/umap/font/FiraSans-UltraLight.woff differ
diff --git a/umap/static/umap/font/FiraSans-UltraLightItalic.eot b/umap/static/umap/font/FiraSans-UltraLightItalic.eot
new file mode 100644
index 00000000..faf786a5
Binary files /dev/null and b/umap/static/umap/font/FiraSans-UltraLightItalic.eot differ
diff --git a/umap/static/umap/font/FiraSans-UltraLightItalic.ttf b/umap/static/umap/font/FiraSans-UltraLightItalic.ttf
new file mode 100644
index 00000000..4a6274ea
Binary files /dev/null and b/umap/static/umap/font/FiraSans-UltraLightItalic.ttf differ
diff --git a/umap/static/umap/font/FiraSans-UltraLightItalic.woff b/umap/static/umap/font/FiraSans-UltraLightItalic.woff
new file mode 100644
index 00000000..04b0b116
Binary files /dev/null and b/umap/static/umap/font/FiraSans-UltraLightItalic.woff differ
diff --git a/umap/static/umap/umap.css b/umap/static/umap/umap.css
index cb714cdb..ac1060cb 100644
--- a/umap/static/umap/umap.css
+++ b/umap/static/umap/umap.css
@@ -4,12 +4,11 @@
 
 
 @font-face {
-    font-family: 'pt_sansbold_italic';
-    src: url('./font/pts76f-webfont.eot');
-    src: url('./font/pts76f-webfont.eot?#iefix') format('embedded-opentype'),
-         url('./font/pts76f-webfont.woff') format('woff'),
-         url('./font/pts76f-webfont.ttf') format('truetype'),
-         url('./font/pts76f-webfont.svg#pt_sansbold_italic') format('svg');
+    font-family: 'fira_sansbold';
+    src: url('./font/FiraSans-Bold.eot');
+    src: url('./font/FiraSans-Bold.eot?#iefix') format('embedded-opentype'),
+         url('./font/FiraSans-Bold.woff') format('woff'),
+         url('./font/FiraSans-Bold.ttf') format('truetype');
     font-weight: normal;
     font-style: normal;
 
@@ -17,40 +16,23 @@
 
 
 @font-face {
-    font-family: 'pt_sansbold';
-    src: url('./font/pts75f-webfont.eot');
-    src: url('./font/pts75f-webfont.eot?#iefix') format('embedded-opentype'),
-         url('./font/pts75f-webfont.woff') format('woff'),
-         url('./font/pts75f-webfont.ttf') format('truetype'),
-         url('./font/pts75f-webfont.svg#pt_sansbold') format('svg');
+    font-family: 'fira_sansregular';
+    src: url('./font/FiraSans-Regular.eot');
+    src: url('./font/FiraSans-Regular.eot?#iefix') format('embedded-opentype'),
+         url('./font/FiraSans-Regular.woff') format('woff'),
+         url('./font/FiraSans-Regular.ttf') format('truetype');
     font-weight: normal;
     font-style: normal;
-
-}
-
-
-@font-face {
-    font-family: 'pt_sansitalic';
-    src: url('./font/pts56f-webfont.eot');
-    src: url('./font/pts56f-webfont.eot?#iefix') format('embedded-opentype'),
-         url('./font/pts56f-webfont.woff') format('woff'),
-         url('./font/pts56f-webfont.ttf') format('truetype'),
-         url('./font/pts56f-webfont.svg#pt_sansitalic') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
 }
 
 @font-face {
-    font-family: 'pt_sansregular';
-    src: url('./font/pts55f-webfont.eot');
-    src: url('./font/pts55f-webfont.eot?#iefix') format('embedded-opentype'),
-         url('./font/pts55f-webfont.woff') format('woff'),
-         url('./font/pts55f-webfont.ttf') format('truetype'),
-         url('./font/pts55f-webfont.svg#pt_sansregular') format('svg');
+    font-family: 'fira_sanslight';
+    src: url('./font/FiraSans-Light.eot');
+    src: url('./font/FiraSans-Light.eot?#iefix') format('embedded-opentype'),
+         url('./font/FiraSans-Light.woff') format('woff'),
+         url('./font/FiraSans-Light.ttf') format('truetype');
     font-weight: normal;
     font-style: normal;
-
 }
 
 
@@ -65,7 +47,7 @@ hr, input, textarea {
     box-sizing: border-box;
     margin: 0;
     padding: 0;
-    font-family: 'pt_sansregular', sans-serif;
+    font-family: 'fira_sanslight', sans-serif;
 }
 a {
     text-decoration: none;
@@ -87,7 +69,7 @@ hr {
     border-width: 1px 0 0;
 }
 h1, h2, h3, h4, h5 {
-    font-family: 'pt_sansbold', sans-serif;
+    font-family: 'fira_sansbold', sans-serif;
     font-weight: normal;
 }
 h1, h2 {
@@ -101,6 +83,10 @@ p {
     margin-top: 14px;
     margin-bottom: 14px;
 }
+strong {
+    font-family: 'fira_sansbold';
+    font-weight: normal;
+}
 
 /*
 * List
@@ -305,7 +291,7 @@ nav h1 a {
     background-position: left center;
     background-repeat: no-repeat;
     background-size: 60px auto;
-    font-family: 'pt_sansbold';
+    font-family: 'fira_sansbold';
     font-size: 30px;
     font-weight: normal;
     height: 70px;
@@ -344,7 +330,7 @@ footer a {
     background-position: left center;
     background-repeat: no-repeat;
     background-size: 60px auto;
-    font-family: 'pt_sansbold';
+    font-family: 'fira_sansbold';
     font-size: 30px;
     font-weight: normal;
     height: 140px;
@@ -372,14 +358,14 @@ footer a {
 }
 .map_list .legend a {
     color: #222;
-    font-family: "pt_sansbold";
+    font-family: "fira_sansbold";
     font-style: normal;
     font-weight: normal;
 }
 .map_list .legend em,
 .map_list .legend em a {
     color: #444;
-    font-family: "pt_sansregular";
+    font-family: "fira_sanslight";
     font-style: normal;
 }
 .map_list hr {