diff --git a/categories.html b/categories.html
index f3d2222..23c5dec 100644
--- a/categories.html
+++ b/categories.html
@@ -91,6 +91,14 @@
     <li>Definitions</li>
     <li>Applications</li>
 </ul>
+</section>
+<section class="slide">
+<h2 id="not-really-about-cat-glory">Not really about: Cat <span class="and">&amp;</span> glory</h2>
+<figure>
+<img src="categories/img/categlory.jpg" alt="Cat n glory" /> <figcaption>credit to Tokuhiro Kawai (川井徳寛)</figcaption>
+</figure>
+
+
 </section>
 <section class="slide">
 <h2 id="general-overview">General Overview</h2>
@@ -115,11 +123,16 @@
 <blockquote>
 <p>Category Theory is a new language/framework for Math</p>
 </blockquote>
+<ul>
+<li>Another way of thinking</li>
+<li>Extremely efficient for generalization</li>
+</ul>
 </section>
 <section class="slide">
 <h2 id="math-programming-relation">Math Programming relation</h2>
 <img class="right" src="categories/img/buddha.gif" alt="Buddha Fractal"/>
 <p>Programming <em><span class="yellow">is</span></em> doing Math</p>
+<p>Strong relations between type theory and category theory.</p>
 <p>Not convinced?<br />Certainly a <em>vocabulary</em> problem.</p>
 <p>One of the goal of Category Theory is to create a <em>homogeneous vocabulary</em> between different disciplines.</p>
 </section>
@@ -419,6 +432,12 @@ such that for each \(f:A→B\):</p>
 <p class="yellow">Only identities</p>
 </section>
 <section class="slide">
+<h2 id="choice">Choice</h2>
+<p>The same object can be seen in many different way as a category.</p>
+<p>You can choose what are object, morphisms and composition.</p>
+<p>ex: <strong>Str</strong> and discrete(Σ<sup>*</sup>)</p>
+</section>
+<section class="slide">
 <h2 class="base1">Categorical Properties</h2>
 
 <p class="base1">Any property which can be expressed in term of category, objects, morphism and composition.</p>
@@ -488,12 +507,13 @@ A <em>functor</em> <span class="yellow">\(\F\)</span> from <span class="blue">\(
 <section class="slide">
 <h2>Plan</h2>
 <ul style="font-size: 2em; font-weight:bold">
-    <li>Why?</li>
-    <li>What?</li>
-    <li><span class="yellow">How?
-        <ul class="base01" style="border-left: 2px solid; padding-left: 1em; font-size: .6em; float: right; font-weight: bold; margin: -2em 0 0 1em">
+    <li>General overview</li>
+    <li>Definitions</li>
+    <li><span class="yellow">Applications
+        <ul class="base01" style="border-left: 2px solid; padding-left: 1em; font-size: .6em; float: right; font-weight: bold; margin: -4em 0 0 1em">
             <li>\(\Hask\) category
             </li><li> Functors
+            </li><li> Natural transformations
             </li><li> Monads
             </li><li> κατα-morphisms
             </li></ul>
@@ -523,7 +543,7 @@ A <em>functor</em> <span class="yellow">\(\F\)</span> from <span class="blue">\(
 <p>Types have <em>kinds</em>; The kind is to type what type is to function. Kind are the types for types (so meta).</p>
 <pre><code>Int, Char :: *
 [], Maybe :: * -&gt; *
-(,) :: * -&gt; * -&gt; *
+(,), (-&gt;) :: * -&gt; * -&gt; *
 [Int], Maybe Char, Maybe [Int] :: *</code></pre>
 </section>
 <section class="slide">
@@ -872,7 +892,7 @@ join (η [x]) = [x] = join [η x]</code></pre>
 <pre class="haskell left smaller" style="width:40%"><code>main = drawImage (width,height)
 
 drawImage :: Screen -&gt; DrawScene
-drawImage <span class="orange">screen</span> =
+drawImage <span class="orange">screen</span> = do
     drawPoint p <span class="orange">screen</span>
     drawCircle c <span class="orange">screen</span>
     drawRectangle r <span class="orange">screen</span>
@@ -923,7 +943,7 @@ drawPoint p = do
 <p>Where is the missing information?</p>
 <ul>
 <li>Functor operator <code>fmap</code></li>
-<li>Algebra representing the <code>(+1)</code> and also knowing the <code>0</code>.</li>
+<li>Algebra representing the <code>(+1)</code> and also knowing about the <code>0</code>.</li>
 </ul>
 <p>First example, make <code>length</code> on <code>[Char]</code></p>
 </section>
@@ -931,10 +951,11 @@ drawPoint p = do
 <h2 id="κατα-morphism-type-work">κατα-morphism: Type work</h2>
 <pre class="haskell"><code>
 data StrF a = Cons Char a | Nil
-data Str = StrF Str
+data Str' = StrF Str'
 
 -- generalize the construction of Str to other datatype
--- Mu :: type fixed point
+-- Mu: type fixed point
+-- Mu :: (* -> *) -> *
 
 data Mu f = InF { outF :: f (Mu f) }
 data Str = Mu StrF
@@ -949,12 +970,16 @@ foo=InF { outF = Cons 'f'
 </section>
 <section class="slide">
 <h2 id="κατα-morphism-missing-information-retrieved">κατα-morphism: missing information retrieved</h2>
-<pre><code>type Algebra f a = f a -&gt; a
+<pre class="haskell"><code>type Algebra f a = f a -> a
 instance Functor (StrF a) =
     fmap f (Cons c x) = Cons c (f x)
     fmap _ Nil = Nil</code></pre>
-<pre><code>cata :: Functor f =&gt; Algebra f a -&gt; Mu f -&gt; a
+
+<pre class="haskell"><code>cata :: Functor f => Algebra f a -> Mu f -> a
 cata f = f . fmap (cata f) . outF</code></pre>
+
+
+
 </section>
 <section class="slide">
 <h2 id="κατα-morphism-finally-length">κατα-morphism: Finally length</h2>
@@ -995,6 +1020,7 @@ depth = cata phi where
 <li>Better modularity</li>
 <li>Better control through properties of types</li>
 </ul>
+<p><span class="smaller">No cat were harmed in the making of this presentation.</span></p>
 </section>
 <!-- End slides. -->
 
diff --git a/categories/10_Introduction/025_Categlory.html b/categories/10_Introduction/025_Categlory.html
new file mode 100644
index 0000000..aaf3051
--- /dev/null
+++ b/categories/10_Introduction/025_Categlory.html
@@ -0,0 +1,6 @@
+<h2 id="not-really-about-cat-glory">Not really about: Cat &amp; glory</h2>
+<figure>
+<img src="categories/img/categlory.jpg" alt="Cat n glory" /> <figcaption>credit to Tokuhiro Kawai (川井徳寛)</figcaption>
+</figure>
+
+
diff --git a/categories/10_Introduction/025_Categlory.md b/categories/10_Introduction/025_Categlory.md
new file mode 100644
index 0000000..585a213
--- /dev/null
+++ b/categories/10_Introduction/025_Categlory.md
@@ -0,0 +1,6 @@
+Not really about: Cat &amp; glory
+---------------------------------
+<figure>
+<img src="categories/img/categlory.jpg" alt="Cat n glory" />
+<figcaption>credit to Tokuhiro Kawai (川井徳寛)</figcaption>
+</figure>
diff --git a/categories/10_Introduction/040_From_a_Programmer_perspective.html b/categories/10_Introduction/040_From_a_Programmer_perspective.html
index 010f6d0..9ba1247 100644
--- a/categories/10_Introduction/040_From_a_Programmer_perspective.html
+++ b/categories/10_Introduction/040_From_a_Programmer_perspective.html
@@ -2,3 +2,7 @@
 <blockquote>
 <p>Category Theory is a new language/framework for Math</p>
 </blockquote>
+<ul>
+<li>Another way of thinking</li>
+<li>Extremely efficient for generalization</li>
+</ul>
diff --git a/categories/10_Introduction/040_From_a_Programmer_perspective.md b/categories/10_Introduction/040_From_a_Programmer_perspective.md
index a6b9aab..d6c3af0 100644
--- a/categories/10_Introduction/040_From_a_Programmer_perspective.md
+++ b/categories/10_Introduction/040_From_a_Programmer_perspective.md
@@ -2,3 +2,6 @@ From a Programmer perspective
 ----------------
 
 > Category Theory is a new language/framework for Math
+
+- Another way of thinking
+- Extremely efficient for generalization
diff --git a/categories/10_Introduction/050_Math_Programming_relation.html b/categories/10_Introduction/050_Math_Programming_relation.html
index 42ddab1..0791660 100644
--- a/categories/10_Introduction/050_Math_Programming_relation.html
+++ b/categories/10_Introduction/050_Math_Programming_relation.html
@@ -1,5 +1,6 @@
 <h2 id="math-programming-relation">Math Programming relation</h2>
 <img class="right" src="categories/img/buddha.gif" alt="Buddha Fractal"/>
 <p>Programming <em><span class="yellow">is</span></em> doing Math</p>
+<p>Strong relations between type theory and category theory.</p>
 <p>Not convinced?<br />Certainly a <em>vocabulary</em> problem.</p>
 <p>One of the goal of Category Theory is to create a <em>homogeneous vocabulary</em> between different disciplines.</p>
diff --git a/categories/10_Introduction/050_Math_Programming_relation.md b/categories/10_Introduction/050_Math_Programming_relation.md
index 90c39b7..7731cb1 100644
--- a/categories/10_Introduction/050_Math_Programming_relation.md
+++ b/categories/10_Introduction/050_Math_Programming_relation.md
@@ -5,6 +5,8 @@ Math Programming relation
 
 Programming *<span class="yellow">is</span>* doing Math
 
+Strong relations between type theory and category theory.
+
 Not convinced?  
 Certainly a _vocabulary_ problem.
 
diff --git a/categories/20_What/205.html b/categories/20_What/205.html
new file mode 100644
index 0000000..74a9ed5
--- /dev/null
+++ b/categories/20_What/205.html
@@ -0,0 +1,4 @@
+<h2 id="choice">Choice</h2>
+<p>The same object can be seen in many different way as a category.</p>
+<p>You can choose what are object, morphisms and composition.</p>
+<p>ex: <strong>Str</strong> and discrete(Σ<sup>*</sup>)</p>
diff --git a/categories/20_What/205.md b/categories/20_What/205.md
new file mode 100644
index 0000000..e4c0cd0
--- /dev/null
+++ b/categories/20_What/205.md
@@ -0,0 +1,8 @@
+Choice
+------
+
+The same object can be seen in many different way as a category.
+
+You can choose what are object, morphisms and composition.
+
+ex: **Str** and discrete(Σ<sup>*</sup>)
diff --git a/categories/30_How/010_Plan.html b/categories/30_How/010_Plan.html
index dbe04b5..2e24030 100644
--- a/categories/30_How/010_Plan.html
+++ b/categories/30_How/010_Plan.html
@@ -1,11 +1,12 @@
 <h2>Plan</h2>
 <ul style="font-size: 2em; font-weight:bold">
-    <li>Why?</li>
-    <li>What?</li>
-    <li><span class="yellow">How?
-        <ul class="base01" style="border-left: 2px solid; padding-left: 1em; font-size: .6em; float: right; font-weight: bold; margin: -2em 0 0 1em">
+    <li>General overview</li>
+    <li>Definitions</li>
+    <li><span class="yellow">Applications
+        <ul class="base01" style="border-left: 2px solid; padding-left: 1em; font-size: .6em; float: right; font-weight: bold; margin: -4em 0 0 1em">
             <li>\(\Hask\) category
             </li><li> Functors
+            </li><li> Natural transformations
             </li><li> Monads
             </li><li> κατα-morphisms
             </li></ul>
diff --git a/categories/30_How/030_Haskell_Kinds.html b/categories/30_How/030_Haskell_Kinds.html
index 231862e..bbee72a 100644
--- a/categories/30_How/030_Haskell_Kinds.html
+++ b/categories/30_How/030_Haskell_Kinds.html
@@ -3,5 +3,5 @@
 <p>Types have <em>kinds</em>; The kind is to type what type is to function. Kind are the types for types (so meta).</p>
 <pre><code>Int, Char :: *
 [], Maybe :: * -&gt; *
-(,) :: * -&gt; * -&gt; *
+(,), (-&gt;) :: * -&gt; * -&gt; *
 [Int], Maybe Char, Maybe [Int] :: *</code></pre>
diff --git a/categories/30_How/030_Haskell_Kinds.md b/categories/30_How/030_Haskell_Kinds.md
index f01c67b..10ac72e 100644
--- a/categories/30_How/030_Haskell_Kinds.md
+++ b/categories/30_How/030_Haskell_Kinds.md
@@ -11,6 +11,6 @@ Kind are the types for types (so meta).
 ~~~
 Int, Char :: *
 [], Maybe :: * -> *
-(,) :: * -> * -> *
+(,), (->) :: * -> * -> *
 [Int], Maybe Char, Maybe [Int] :: *
 ~~~
diff --git a/categories/30_How/200_Monads/160_Monads_useful.html b/categories/30_How/200_Monads/160_Monads_useful.html
index 96508e6..08e235b 100644
--- a/categories/30_How/200_Monads/160_Monads_useful.html
+++ b/categories/30_How/200_Monads/160_Monads_useful.html
@@ -4,7 +4,7 @@
 <pre class="haskell left smaller" style="width:40%"><code>main = drawImage (width,height)
 
 drawImage :: Screen -&gt; DrawScene
-drawImage <span class="orange">screen</span> =
+drawImage <span class="orange">screen</span> = do
     drawPoint p <span class="orange">screen</span>
     drawCircle c <span class="orange">screen</span>
     drawRectangle r <span class="orange">screen</span>
diff --git a/categories/30_How/300_Catamorphisms/040_morphism_Missing_Information.html b/categories/30_How/300_Catamorphisms/040_morphism_Missing_Information.html
index 8a6ae9f..9685c76 100644
--- a/categories/30_How/300_Catamorphisms/040_morphism_Missing_Information.html
+++ b/categories/30_How/300_Catamorphisms/040_morphism_Missing_Information.html
@@ -2,6 +2,6 @@
 <p>Where is the missing information?</p>
 <ul>
 <li>Functor operator <code>fmap</code></li>
-<li>Algebra representing the <code>(+1)</code> and also knowing the <code>0</code>.</li>
+<li>Algebra representing the <code>(+1)</code> and also knowing about the <code>0</code>.</li>
 </ul>
 <p>First example, make <code>length</code> on <code>[Char]</code></p>
diff --git a/categories/30_How/300_Catamorphisms/040_morphism_Missing_Information.md b/categories/30_How/300_Catamorphisms/040_morphism_Missing_Information.md
index d0eed85..f736a77 100644
--- a/categories/30_How/300_Catamorphisms/040_morphism_Missing_Information.md
+++ b/categories/30_How/300_Catamorphisms/040_morphism_Missing_Information.md
@@ -4,6 +4,6 @@
 Where is the missing information?
 
 - Functor operator `fmap`
-- Algebra representing the `(+1)` and also knowing the `0`.
+- Algebra representing the `(+1)` and also knowing about the `0`.
 
 First example, make `length` on `[Char]`
diff --git a/categories/30_How/300_Catamorphisms/050_morphism_Type_work.html b/categories/30_How/300_Catamorphisms/050_morphism_Type_work.html
index 540a31b..ad23bc6 100644
--- a/categories/30_How/300_Catamorphisms/050_morphism_Type_work.html
+++ b/categories/30_How/300_Catamorphisms/050_morphism_Type_work.html
@@ -1,10 +1,11 @@
 <h2 id="κατα-morphism-type-work">κατα-morphism: Type work</h2>
 <pre class="haskell"><code>
 data StrF a = Cons Char a | Nil
-data Str = StrF Str
+data Str' = StrF Str'
 
 -- generalize the construction of Str to other datatype
--- Mu :: type fixed point
+-- Mu: type fixed point
+-- Mu :: (* -> *) -> *
 
 data Mu f = InF { outF :: f (Mu f) }
 data Str = Mu StrF
diff --git a/categories/30_How/300_Catamorphisms/050_morphism_Type_work.md b/categories/30_How/300_Catamorphisms/050_morphism_Type_work.md
index b43e653..72fe78b 100644
--- a/categories/30_How/300_Catamorphisms/050_morphism_Type_work.md
+++ b/categories/30_How/300_Catamorphisms/050_morphism_Type_work.md
@@ -3,10 +3,11 @@
 
 <pre class="haskell"><code>
 data StrF a = Cons Char a | Nil
-data Str = StrF Str
+data Str' = StrF Str'
 
 -- generalize the construction of Str to other datatype
--- Mu :: type fixed point
+-- Mu: type fixed point
+-- Mu :: (* -> *) -> *
 
 data Mu f = InF { outF :: f (Mu f) }
 data Str = Mu StrF
diff --git a/categories/30_How/300_Catamorphisms/060_morphism_missing_information_retrieved.html b/categories/30_How/300_Catamorphisms/060_morphism_missing_information_retrieved.html
index b138384..4d64dbc 100644
--- a/categories/30_How/300_Catamorphisms/060_morphism_missing_information_retrieved.html
+++ b/categories/30_How/300_Catamorphisms/060_morphism_missing_information_retrieved.html
@@ -1,7 +1,11 @@
 <h2 id="κατα-morphism-missing-information-retrieved">κατα-morphism: missing information retrieved</h2>
-<pre><code>type Algebra f a = f a -&gt; a
+<pre class="haskell"><code>type Algebra f a = f a -> a
 instance Functor (StrF a) =
     fmap f (Cons c x) = Cons c (f x)
     fmap _ Nil = Nil</code></pre>
-<pre><code>cata :: Functor f =&gt; Algebra f a -&gt; Mu f -&gt; a
+
+<pre class="haskell"><code>cata :: Functor f => Algebra f a -> Mu f -> a
 cata f = f . fmap (cata f) . outF</code></pre>
+
+
+
diff --git a/categories/30_How/300_Catamorphisms/060_morphism_missing_information_retrieved.md b/categories/30_How/300_Catamorphisms/060_morphism_missing_information_retrieved.md
index 5f4b18b..80b4c46 100644
--- a/categories/30_How/300_Catamorphisms/060_morphism_missing_information_retrieved.md
+++ b/categories/30_How/300_Catamorphisms/060_morphism_missing_information_retrieved.md
@@ -1,15 +1,11 @@
 κατα-morphism: missing information retrieved
 --------------------------------------------
 
-~~~
-type Algebra f a = f a -> a
+<pre class="haskell"><code>type Algebra f a = f a -> a
 instance Functor (StrF a) =
 	fmap f (Cons c x) = Cons c (f x)
-	fmap _ Nil = Nil
-~~~
+	fmap _ Nil = Nil</code></pre>
 
-~~~
-cata :: Functor f => Algebra f a -> Mu f -> a
-cata f = f . fmap (cata f) . outF
-~~~
+<pre class="haskell"><code>cata :: Functor f => Algebra f a -> Mu f -> a
+cata f = f . fmap (cata f) . outF</code></pre>
 
diff --git a/categories/40_Conclusion/010_Conclusion.html b/categories/40_Conclusion/010_Conclusion.html
index 1dba2f7..a0e58d8 100644
--- a/categories/40_Conclusion/010_Conclusion.html
+++ b/categories/40_Conclusion/010_Conclusion.html
@@ -6,3 +6,4 @@
 <li>Better modularity</li>
 <li>Better control through properties of types</li>
 </ul>
+<p><span class="smaller">No cat were harmed in the making of this presentation.</span></p>
diff --git a/categories/40_Conclusion/010_Conclusion.md b/categories/40_Conclusion/010_Conclusion.md
index 4466ee6..fa3762e 100644
--- a/categories/40_Conclusion/010_Conclusion.md
+++ b/categories/40_Conclusion/010_Conclusion.md
@@ -7,3 +7,5 @@ Category Theory oriented Programming:
 - Extreme generalisation
 - Better modularity
 - Better control through properties of types
+
+<span class="smaller">No cat were harmed in the making of this presentation.</span>
diff --git a/categories/img/categlory.jpg b/categories/img/categlory.jpg
new file mode 100644
index 0000000..9295419
Binary files /dev/null and b/categories/img/categlory.jpg differ
diff --git a/themes/style/y/main.css b/themes/style/y/main.css
index d422975..7ca6f5f 100644
--- a/themes/style/y/main.css
+++ b/themes/style/y/main.css
@@ -910,186 +910,6 @@ body.deck-container {
 .no-touch .deck-menu .slide:hover {
   background: #073642; }
 
-@media only screen and (min-width: 480px) {
-  body {
-    width: 470px !important;
-    min-width: 470px !important;
-    max-width: 470px !important;
-    height: 261px !important;
-    min-height: 261px !important;
-    max-height: 261px !important;
-    padding: 0 5px !important;
-    margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
-    height: 50%; }
-
-  .deck-container {
-    font-size: 12px; } }
-@media only screen and (min-width: 520px) {
-  body {
-    width: 509.16667px !important;
-    min-width: 509.16667px !important;
-    max-width: 509.16667px !important;
-    height: 282.75px !important;
-    min-height: 282.75px !important;
-    max-height: 282.75px !important;
-    padding: 0 5.41667px !important;
-    margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
-    height: 50%; }
-
-  .deck-container {
-    font-size: 13px; } }
-@media only screen and (min-width: 560px) {
-  body {
-    width: 548.33333px !important;
-    min-width: 548.33333px !important;
-    max-width: 548.33333px !important;
-    height: 304.5px !important;
-    min-height: 304.5px !important;
-    max-height: 304.5px !important;
-    padding: 0 5.83333px !important;
-    margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
-    height: 50%; }
-
-  .deck-container {
-    font-size: 14px; } }
-@media only screen and (min-width: 600px) {
-  body {
-    width: 587.5px !important;
-    min-width: 587.5px !important;
-    max-width: 587.5px !important;
-    height: 326.25px !important;
-    min-height: 326.25px !important;
-    max-height: 326.25px !important;
-    padding: 0 6.25px !important;
-    margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
-    height: 50%; }
-
-  .deck-container {
-    font-size: 15px; } }
-@media only screen and (min-width: 640px) {
-  body {
-    width: 626.66667px !important;
-    min-width: 626.66667px !important;
-    max-width: 626.66667px !important;
-    height: 348px !important;
-    min-height: 348px !important;
-    max-height: 348px !important;
-    padding: 0 6.66667px !important;
-    margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
-    height: 50%; }
-
-  .deck-container {
-    font-size: 16px; } }
-@media only screen and (min-width: 680px) {
-  body {
-    width: 665.83333px !important;
-    min-width: 665.83333px !important;
-    max-width: 665.83333px !important;
-    height: 369.75px !important;
-    min-height: 369.75px !important;
-    max-height: 369.75px !important;
-    padding: 0 7.08333px !important;
-    margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
-    height: 50%; }
-
-  .deck-container {
-    font-size: 17px; } }
-@media only screen and (min-width: 720px) {
-  body {
-    width: 705px !important;
-    min-width: 705px !important;
-    max-width: 705px !important;
-    height: 391.5px !important;
-    min-height: 391.5px !important;
-    max-height: 391.5px !important;
-    padding: 0 7.5px !important;
-    margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
-    height: 50%; }
-
-  .deck-container {
-    font-size: 18px; } }
-@media only screen and (min-width: 760px) {
-  body {
-    width: 744.16667px !important;
-    min-width: 744.16667px !important;
-    max-width: 744.16667px !important;
-    height: 413.25px !important;
-    min-height: 413.25px !important;
-    max-height: 413.25px !important;
-    padding: 0 7.91667px !important;
-    margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
-    height: 50%; }
-
-  .deck-container {
-    font-size: 19px; } }
-@media only screen and (min-width: 800px) {
-  body {
-    width: 783.33333px !important;
-    min-width: 783.33333px !important;
-    max-width: 783.33333px !important;
-    height: 435px !important;
-    min-height: 435px !important;
-    max-height: 435px !important;
-    padding: 0 8.33333px !important;
-    margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
-    height: 50%; }
-
-  .deck-container {
-    font-size: 20px; } }
-@media only screen and (min-width: 840px) {
-  body {
-    width: 822.5px !important;
-    min-width: 822.5px !important;
-    max-width: 822.5px !important;
-    height: 456.75px !important;
-    min-height: 456.75px !important;
-    max-height: 456.75px !important;
-    padding: 0 8.75px !important;
-    margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
-    height: 50%; }
-
-  .deck-container {
-    font-size: 21px; } }
-@media only screen and (min-width: 880px) {
-  body {
-    width: 861.66667px !important;
-    min-width: 861.66667px !important;
-    max-width: 861.66667px !important;
-    height: 478.5px !important;
-    min-height: 478.5px !important;
-    max-height: 478.5px !important;
-    padding: 0 9.16667px !important;
-    margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
-    height: 50%; }
-
-  .deck-container {
-    font-size: 22px; } }
-@media only screen and (min-width: 920px) {
-  body {
-    width: 900.83333px !important;
-    min-width: 900.83333px !important;
-    max-width: 900.83333px !important;
-    height: 500.25px !important;
-    min-height: 500.25px !important;
-    max-height: 500.25px !important;
-    padding: 0 9.58333px !important;
-    margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
-    height: 50%; }
-
-  .deck-container {
-    font-size: 23px; } }
 @media only screen and (min-width: 960px) {
   body {
     width: 940px !important;
@@ -1100,7 +920,6 @@ body.deck-container {
     max-height: 522px !important;
     padding: 0 10px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1115,7 +934,6 @@ body.deck-container {
     max-height: 543.75px !important;
     padding: 0 10.41667px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1130,7 +948,6 @@ body.deck-container {
     max-height: 565.5px !important;
     padding: 0 10.83333px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1145,7 +962,6 @@ body.deck-container {
     max-height: 587.25px !important;
     padding: 0 11.25px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1160,7 +976,6 @@ body.deck-container {
     max-height: 609px !important;
     padding: 0 11.66667px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1175,7 +990,6 @@ body.deck-container {
     max-height: 630.75px !important;
     padding: 0 12.08333px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1190,7 +1004,6 @@ body.deck-container {
     max-height: 652.5px !important;
     padding: 0 12.5px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1205,7 +1018,6 @@ body.deck-container {
     max-height: 674.25px !important;
     padding: 0 12.91667px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1220,7 +1032,6 @@ body.deck-container {
     max-height: 696px !important;
     padding: 0 13.33333px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1235,7 +1046,6 @@ body.deck-container {
     max-height: 717.75px !important;
     padding: 0 13.75px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1250,7 +1060,6 @@ body.deck-container {
     max-height: 739.5px !important;
     padding: 0 14.16667px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1265,7 +1074,6 @@ body.deck-container {
     max-height: 761.25px !important;
     padding: 0 14.58333px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1280,7 +1088,6 @@ body.deck-container {
     max-height: 783px !important;
     padding: 0 15px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1295,7 +1102,6 @@ body.deck-container {
     max-height: 804.75px !important;
     padding: 0 15.41667px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1310,7 +1116,6 @@ body.deck-container {
     max-height: 826.5px !important;
     padding: 0 15.83333px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1325,7 +1130,6 @@ body.deck-container {
     max-height: 848.25px !important;
     padding: 0 16.25px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1340,7 +1144,6 @@ body.deck-container {
     max-height: 870px !important;
     padding: 0 16.66667px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1355,7 +1158,6 @@ body.deck-container {
     max-height: 891.75px !important;
     padding: 0 17.08333px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1370,7 +1172,6 @@ body.deck-container {
     max-height: 913.5px !important;
     padding: 0 17.5px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1385,7 +1186,6 @@ body.deck-container {
     max-height: 935.25px !important;
     padding: 0 17.91667px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1400,7 +1200,6 @@ body.deck-container {
     max-height: 957px !important;
     padding: 0 18.33333px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1415,7 +1214,6 @@ body.deck-container {
     max-height: 978.75px !important;
     padding: 0 18.75px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1430,7 +1228,6 @@ body.deck-container {
     max-height: 1000.5px !important;
     padding: 0 19.16667px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1445,7 +1242,6 @@ body.deck-container {
     max-height: 1022.25px !important;
     padding: 0 19.58333px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1460,7 +1256,6 @@ body.deck-container {
     max-height: 1044px !important;
     padding: 0 20px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1475,7 +1270,6 @@ body.deck-container {
     max-height: 1065.75px !important;
     padding: 0 20.41667px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1490,7 +1284,6 @@ body.deck-container {
     max-height: 1087.5px !important;
     padding: 0 20.83333px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1505,7 +1298,6 @@ body.deck-container {
     max-height: 1109.25px !important;
     padding: 0 21.25px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1520,7 +1312,6 @@ body.deck-container {
     max-height: 1131px !important;
     padding: 0 21.66667px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1535,7 +1326,6 @@ body.deck-container {
     max-height: 1152.75px !important;
     padding: 0 22.08333px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1550,7 +1340,6 @@ body.deck-container {
     max-height: 1174.5px !important;
     padding: 0 22.5px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1565,7 +1354,6 @@ body.deck-container {
     max-height: 1196.25px !important;
     padding: 0 22.91667px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1580,7 +1368,6 @@ body.deck-container {
     max-height: 1218px !important;
     padding: 0 23.33333px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1595,7 +1382,6 @@ body.deck-container {
     max-height: 1239.75px !important;
     padding: 0 23.75px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1610,7 +1396,6 @@ body.deck-container {
     max-height: 1261.5px !important;
     padding: 0 24.16667px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1625,7 +1410,6 @@ body.deck-container {
     max-height: 1283.25px !important;
     padding: 0 24.58333px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1640,7 +1424,6 @@ body.deck-container {
     max-height: 1305px !important;
     padding: 0 25px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1655,7 +1438,6 @@ body.deck-container {
     max-height: 1326.75px !important;
     padding: 0 25.41667px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1670,7 +1452,6 @@ body.deck-container {
     max-height: 1348.5px !important;
     padding: 0 25.83333px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1685,7 +1466,6 @@ body.deck-container {
     max-height: 1370.25px !important;
     padding: 0 26.25px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1700,7 +1480,6 @@ body.deck-container {
     max-height: 1392px !important;
     padding: 0 26.66667px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1715,7 +1494,6 @@ body.deck-container {
     max-height: 1413.75px !important;
     padding: 0 27.08333px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1730,7 +1508,6 @@ body.deck-container {
     max-height: 1435.5px !important;
     padding: 0 27.5px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1745,7 +1522,6 @@ body.deck-container {
     max-height: 1457.25px !important;
     padding: 0 27.91667px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1760,7 +1536,6 @@ body.deck-container {
     max-height: 1479px !important;
     padding: 0 28.33333px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1775,7 +1550,6 @@ body.deck-container {
     max-height: 1500.75px !important;
     padding: 0 28.75px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1790,7 +1564,6 @@ body.deck-container {
     max-height: 1522.5px !important;
     padding: 0 29.16667px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1805,7 +1578,6 @@ body.deck-container {
     max-height: 1544.25px !important;
     padding: 0 29.58333px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1820,7 +1592,6 @@ body.deck-container {
     max-height: 1566px !important;
     padding: 0 30px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1835,7 +1606,6 @@ body.deck-container {
     max-height: 1587.75px !important;
     padding: 0 30.41667px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1850,7 +1620,6 @@ body.deck-container {
     max-height: 1609.5px !important;
     padding: 0 30.83333px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1865,7 +1634,6 @@ body.deck-container {
     max-height: 1631.25px !important;
     padding: 0 31.25px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1880,7 +1648,6 @@ body.deck-container {
     max-height: 1653px !important;
     padding: 0 31.66667px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1895,7 +1662,6 @@ body.deck-container {
     max-height: 1674.75px !important;
     padding: 0 32.08333px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1910,7 +1676,6 @@ body.deck-container {
     max-height: 1696.5px !important;
     padding: 0 32.5px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1925,7 +1690,6 @@ body.deck-container {
     max-height: 1718.25px !important;
     padding: 0 32.91667px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1940,7 +1704,6 @@ body.deck-container {
     max-height: 1740px !important;
     padding: 0 33.33333px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1955,7 +1718,6 @@ body.deck-container {
     max-height: 1761.75px !important;
     padding: 0 33.75px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1970,7 +1732,6 @@ body.deck-container {
     max-height: 1783.5px !important;
     padding: 0 34.16667px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -1985,7 +1746,6 @@ body.deck-container {
     max-height: 1805.25px !important;
     padding: 0 34.58333px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -2000,7 +1760,6 @@ body.deck-container {
     max-height: 1827px !important;
     padding: 0 35px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -2015,7 +1774,6 @@ body.deck-container {
     max-height: 1848.75px !important;
     padding: 0 35.41667px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -2030,7 +1788,6 @@ body.deck-container {
     max-height: 1870.5px !important;
     padding: 0 35.83333px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -2045,7 +1802,6 @@ body.deck-container {
     max-height: 1892.25px !important;
     padding: 0 36.25px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -2060,7 +1816,6 @@ body.deck-container {
     max-height: 1914px !important;
     padding: 0 36.66667px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -2075,7 +1830,6 @@ body.deck-container {
     max-height: 1935.75px !important;
     padding: 0 37.08333px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
@@ -2090,11 +1844,16 @@ body.deck-container {
     max-height: 1957.5px !important;
     padding: 0 37.5px !important;
     margin: 0 auto;
-    box-shadow: 0 0 10px #586e75 inset;
     height: 50%; }
 
   .deck-container {
     font-size: 90px; } }
+@media only screen and (max-width: 960px) {
+  body {
+    padding: 0 10px !important; }
+
+  .deck-container {
+    font-size: 24px; } }
 #MathJax_Message {
   font-size: 0.4em !important;
   font-shadow: none !important;
diff --git a/themes/style/y/main.sass b/themes/style/y/main.sass
index b520a6a..e2145e6 100644
--- a/themes/style/y/main.sass
+++ b/themes/style/y/main.sass
@@ -1156,7 +1156,7 @@ $padsize:20
 $maxwidth:800
 $width:760
 $height:500
-@for $fontsize from 12 through 90
+@for $fontsize from 24 through 90
   $padsize:$fontsize*20/48
   $maxwidth:$fontsize*1920/48
   $width:$maxwidth - 2*$padsize
@@ -1171,10 +1171,20 @@ $height:500
       max-height: #{$height}px !important
       padding: 0 #{$padsize}px !important
       margin: 0 auto
-      box-shadow: 0 0 10px $base01 inset
       height: 50%
+      // box-shadow: 0 0 3px $base01 inset
     .deck-container
       font-size: #{$fontsize}px
+$fontsize: 24
+$padsize:$fontsize*20/48
+$maxwidth:$fontsize*1920/48
+$width:$maxwidth - 2*$padsize
+$height:$fontsize*1044/48
+@media only screen and (max-width: #{$maxwidth}px)
+  body
+    padding: 0 #{$padsize}px !important
+  .deck-container
+    font-size: #{$fontsize}px
 
 #MathJax_Message
   font-size: .4em !important