diff --git a/app/index.html b/app/index.html
index 69d7e29..b5971c0 100644
--- a/app/index.html
+++ b/app/index.html
@@ -47,7 +47,7 @@
     <script src="bower_components/json3/lib/json3.min.js"></script>
     <![endif]-->
     <script type="text/javascript">
-        var VERSION = '30-11_03';
+        var VERSION = '30-11_04';
         var require = {
           urlArgs: "ver="+VERSION,
         };
diff --git a/app/scripts/controllers/tshirtdesign.js b/app/scripts/controllers/tshirtdesign.js
index a13ecee..d0de90b 100644
--- a/app/scripts/controllers/tshirtdesign.js
+++ b/app/scripts/controllers/tshirtdesign.js
@@ -420,68 +420,256 @@ define(['app'], function (app) {
 		
 		//Font
 		$scope.listFontFamily = [
+			// {
+			// 	name : 'GN Aki iro Sesami Cookies',
+			// 	slug : 'gn_aki_iro_sesami_cookies',
+			// },
+			// {
+			// 	name : 'GN-Fuyu-iro_Script_Bold',
+			// 	slug : 'gn_fuyu_iro_script_bold'
+			// },
+			// {
+			// 	name : 'GN Killgothic U Kanana',
+			// 	slug : 'gn_killgothic_u_kanana'
+			// },
+			// {
+			// 	name : 'GN-Kin-iro_Alphabet_Cookies',
+			// 	slug : 'gn_kin_iro_alphabet_cookies'
+            //
+			// },
+			// {
+			// 	name : 'GN-Kin-iro_SansSerif',
+			// 	slug : 'gn_kin_iro_sansserif'
+            //
+			// },
+			// {
+			// 	name : 'GN-Koharuiro_Sunray',
+			// 	slug : 'gn_koharuiro_sunray'
+            //
+			// },
+			// {
+			// 	name : 'GN-Kyu-pin',
+			// 	slug : 'gn_kyu_pin'
+			// },
+			// {
+			// 	name : 'gn_natsu_iro_schedule',
+			// 	slug : 'gn_natsu_iro_schedule'
+            //
+			// },
+			// {
+			// 	name : 'gnkana_kiniro_sansserif_l',
+			// 	slug : 'gnkana_kiniro_sansserif_l'
+            //
+			// },
+			// {
+			// 	name : 'gnkana_kiniro_sansserif_st',
+			// 	slug : 'gnkana_kiniro_sansserif_st'
+			// },
+			// {
+			// 	name : 'gnkana_kon_iro_nightfall',
+			// 	slug : 'gnkana_kon_iro_nightfall'
+            //
+			// },
+			// {
+			// 	name : 'ms_gothic',
+			// 	slug : 'ms_gothic'
+            //
+			// },
+			// {
+			// 	name : 'msmincho',
+			// 	slug : 'msmincho'
+			// },
+			// {
+			// 	name : 'ufonts_com_ms_pgothic',
+			// 	slug : 'ufonts_com_ms_pgothic'
+			// }
 			{
-				name : 'GN Aki iro Sesami Cookies',
-				slug : 'gn_aki_iro_sesami_cookies',
+				name: 'Roboto',
+				slug: "'Roboto', sans-serif"
 			},
 			{
-				name : 'GN-Fuyu-iro_Script_Bold',
-				slug : 'gn_fuyu_iro_script_bold'
+				name: 'Bungee',
+				slug: "'Bungee', cursive"
 			},
 			{
-				name : 'GN Killgothic U Kanana',
-				slug : 'gn_killgothic_u_kanana'
+				name: 'Aref Ruqaa',
+				slug: "'Aref Ruqaa', serif"
 			},
 			{
-				name : 'GN-Kin-iro_Alphabet_Cookies',
-				slug : 'gn_kin_iro_alphabet_cookies'
-
+				name: 'Open Sans',
+				slug: "'Open Sans', sans-serif"
 			},
 			{
-				name : 'GN-Kin-iro_SansSerif',
-				slug : 'gn_kin_iro_sansserif'
-
+				name: 'Lato',
+				slug: "'Lato', sans-serif"
 			},
 			{
-				name : 'GN-Koharuiro_Sunray',
-				slug : 'gn_koharuiro_sunray'
-
+				name: 'Slabo 27px',
+				slug: "'Slabo 27px', serif"
 			},
 			{
-				name : 'GN-Kyu-pin',
-				slug : 'gn_kyu_pin'
+				name: 'Oswald',
+				slug: "'Oswald', sans-serif"
 			},
 			{
-				name : 'gn_natsu_iro_schedule',
-				slug : 'gn_natsu_iro_schedule'
-
+				name: 'Yrsa',
+				slug: "'Yrsa', serif"
 			},
 			{
-				name : 'gnkana_kiniro_sansserif_l',
-				slug : 'gnkana_kiniro_sansserif_l'
-
+				name: 'Source Sans Pro',
+				slug: "'Source Sans Pro', sans-serif"
 			},
 			{
-				name : 'gnkana_kiniro_sansserif_st',
-				slug : 'gnkana_kiniro_sansserif_st'
+				name: 'Montserrat',
+				slug: "'Montserrat', sans-serif"
 			},
 			{
-				name : 'gnkana_kon_iro_nightfall',
-				slug : 'gnkana_kon_iro_nightfall'
-
+				name: 'Raleway',
+				slug: "'Raleway', sans-serif"
 			},
 			{
-				name : 'ms_gothic',
-				slug : 'ms_gothic'
-
+				name: 'Merriweather',
+				slug: "'Merriweather', serif"
+			},
+			{
+				name: 'Open Sans Condensed',
+				slug: "'Open Sans Condensed', sans-serif"
+			},
+			{
+				name: 'Maitree',
+				slug: "'Maitree', serif"
+			},
+			{
+				name: 'Lora',
+				slug: "'Lora', serif"
+			},
+			{
+				name: 'Playfair Display',
+				slug: "'Playfair Display', serif"
+			},
+			{
+				name: 'Noto Sans',
+				slug: "''Noto Sans', sans-serif', sans-serif"
+			},
+			{
+				name: 'PT Sans Narrow',
+				slug: "'PT Sans Narrow', sans-serif"
+			},
+			{
+				name: 'Titillium Web',
+				slug: "'Titillium Web', sans-serif"
+			},
+			{
+				name: 'Muli',
+				slug: "'Muli', sans-serif"
+			},
+			{
+				name: 'Inconsolata',
+				slug: "'Inconsolata', monospace"
+			},
+			{
+				name: 'Indie Flower',
+				slug: "'Indie Flower', cursive"
+			},
+			{
+				name: 'Bitter',
+				slug: "'Bitter', serif"
+			},
+			{
+				name: 'Dosis',
+				slug: "'Dosis', sans-serif"
+			},
+			{
+				name: 'Oxygen',
+				slug: "'Oxygen', sans-serif"
+			},
+			{
+				name: 'Hind',
+				slug: "'Hind', sans-serif"
+			},
+			{
+				name: 'Tillana',
+				slug: "'Tillana', cursive"
+			},
+			{
+				name: 'Fjalla One',
+				slug: "'Fjalla One', sans-serif"
+			},
+			{
+				name: 'Cabin',
+				slug: "'Cabin', sans-serif"
+			},
+			{
+				name: 'Nunito',
+				slug: "'Nunito', sans-serif"
+			},
+			{
+				name: 'Anton',
+				slug: "'Anton', sans-serif"
+			},
+			{
+				name: 'Lobster',
+				slug: "'Lobster', cursive"
+			},
+			{
+				name: 'Yanone Kaffeesatz',
+				slug: "'Yanone Kaffeesatz', sans-serif"
+			},
+			{
+				name: 'Reem Kufi',
+				slug: "'Reem Kufi', sans-serif"
+			},
+			{
+				name: 'Merriweather Sans',
+				slug: "'Merriweather Sans', sans-serif"
+			},
+			{
+				name: 'Bree Serif',
+				slug: "'Bree Serif', serif"
+			},
+			{
+				name: 'Josefin Sans',
+				slug: "'Josefin Sans', sans-serif"
+			},
+			{
+				name: 'Abel',
+				slug: "'Abel', sans-serif"
+			},
+			{
+				name: 'Crimson Text',
+				slug: "'Crimson Text', serif"
+			},
+			{
+				name: 'Gloria Hallelujah',
+				slug: "'Gloria Hallelujah', cursive"
+			},
+			{
+				name: 'Bungee Inline',
+				slug: "'Bungee Inline', cursive"
+			},
+			{
+				name: 'Amatic SC',
+				slug: "'Amatic SC', cursive"
+			},
+			{
+				name: 'Shadows Into Light',
+				slug: "'Shadows Into Light', cursive"
+			},
+			{
+				name: 'Dancing Script',
+				slug: "'Dancing Script', cursive"
+			},
+			{
+				name: 'Orbitron',
+				slug: "'Orbitron', sans-serif"
 			},
 			{
-				name : 'msmincho',
-				slug : 'msmincho'
+				name: 'Source Code Pro',
+				slug: "'Source Code Pro', monospace"
 			},
 			{
-				name : 'ufonts_com_ms_pgothic',
-				slug : 'ufonts_com_ms_pgothic'
+				name: 'Permanent Marker',
+				slug: "'Permanent Marker', cursive"
 			}
 		];
 		
diff --git a/app/styles/main.css b/app/styles/main.css
index 7a529c9..f4ae944 100644
--- a/app/styles/main.css
+++ b/app/styles/main.css
@@ -1,6 +1,7 @@
 /* Space out content a bit */
 @import "../fonts/font.css";
-@import "../fonts/font_canvas/font-canvas.css";
+/*@import "../fonts/font_canvas/font-canvas.css";*/
+@import url('https://fonts.googleapis.com/css?family=Abel|Amatic+SC|Anton|Aref+Ruqaa|Bitter|Bree+Serif|Bungee|Bungee+Inline|Cabin|Crimson+Text|Dancing+Script|Dosis|Fjalla+One|Gloria+Hallelujah|Hind|Inconsolata|Indie+Flower|Josefin+Sans|Lato|Lobster|Lora|Maitree|Merriweather|Merriweather+Sans|Montserrat|Muli|Noto+Sans|Nunito|Open+Sans|Open+Sans+Condensed:300|Orbitron|Oswald|Oxygen|PT+Sans+Narrow|Permanent+Marker|Playfair+Display|Raleway|Reem+Kufi|Roboto|Shadows+Into+Light|Slabo+27px|Source+Code+Pro|Source+Sans+Pro|Tillana|Titillium+Web|Yanone+Kaffeesatz|Yrsa');
 @import "placedesign.css";
 html{
   height:100%;