--- notification-ui.xml.orig	2016-10-10 19:55:20.796354375 +0000
+++ notification-ui.xml	2016-10-10 19:40:05.992756927 +0000
@@ -3,11 +3,9 @@
 
 <mythuitheme>
 
-    <baseres>1280x720</baseres>
-
     <window name="notification">
 
-        <area>-1,36,780,180</area>
+        <area>800,24,470,136</area>
 
         <animation trigger="AboutToShow">
             <section>
@@ -24,83 +22,79 @@
         </animation>
 
         <shape name="notification-backdrop" from="base_popup_backdrop">
-            <area>0,0,780,180</area>
+            <area>0,0,470,122</area>
         </shape>
 
         <shape name="notification-backdrop-line" from="base_backdrop_line">
-            <area>1,1,778,178</area>
+            <area>1,1,468,120</area>
         </shape>
 
         <shape name="notification-top-line" from="base_highlight_line">
-            <area>2,2,776,2</area>
+            <area>2,2,466,2</area>
         </shape>
 
         <shape name="notification-bottom-line" from="base_highlight_line">
-            <area>1,176,776,2</area>
+            <area>1,118,466,2</area>
         </shape>
 
         <shape name="notification-left-line" from="base_highlight_vertical_line">
-            <area>2,4,2,170</area>
+            <area>2,4,2,112</area>
         </shape>
 
         <shape name="notification-right-line" from="base_highlight_vertical_line">
-            <area>776,4,2,170</area>
+            <area>466,4,2,112</area>
         </shape>
 
         <textarea name="title" from="basetextarea" depends="progress">
-            <area>14,18,752,35</area>
-            <font>basemediumlargerbold</font>
+            <area>14,11,438,35</area>
+            <font>basemediumlargeryellow</font>
+            <scroll direction="left" startdelay="1"/>
         </textarea>
 
         <textarea name="title_noprogress" from="basetextarea" depends="!progress">
-            <area>14,11,752,35</area>
-            <font>basemediumlargerbold</font>
+            <area>14,11,438,35</area>
+            <font>basemediumlargeryellow</font>
             <template>%TITLE%</template>
+            <scroll direction="left" startdelay="1"/>
         </textarea>
 
         <textarea name="origin" from="basetextarea" depends="progress">
-            <area>14,53,752,30</area>
+            <area>14,46,438,30</area>
             <font>basesomewhatsmaller</font>
+            <scroll direction="left" startdelay="1"/>
+            <template>[%ORIGIN%] %DESCRIPTION%</template>
         </textarea>
 
         <textarea name="origin_noprogress" from="basetextarea" depends="!progress">
-            <area>14,46,752,30</area>
-            <font>basesomewhatsmaller</font>
-            <template>%ORIGIN%</template>
-        </textarea>
-
-        <textarea name="description" from="basetextarea" depends="progress">
-            <area>14,83,752,30</area>
+            <area>14,46,438,30</area>
             <font>basesomewhatsmaller</font>
+            <scroll direction="left" startdelay="1"/>
+            <template>[%ORIGIN%]</template>
         </textarea>
 
         <textarea name="description_noprogress" from="basetextarea" depends="!progress">
-            <area>14,76,752,90</area>
+            <area>14,76,438,30</area>
             <font>basesomewhatsmaller</font>
-            <multiline>yes</multiline>
             <align>left,top</align>
+            <scroll direction="left" startdelay="1"/>
             <template>%DESCRIPTION%</template>
         </textarea>
 
-        <textarea name="extra" from="basetextarea" depends="progress">
-            <area>14,113,300,30</area>
-            <font>basesomewhatsmaller</font>
-        </textarea>
-
         <textarea name="progress_text" from="basetextarea" depends="progress">
-            <area>370,113,396,30</area>
+            <area>14,80,206,30</area>
             <font>basesomewhatsmaller</font>
             <align>right</align>
+            <scroll direction="left" startdelay="1"/>
         </textarea>
 
         <progressbar name="progress" from="baseprogressbar">
-            <position>14,148</position>
+            <position>230,90</position>
             <imagetype name="background">
-                <area>0,0,752,10</area>
+                <area>0,0,226,10</area>
                 <filename>images/progressbar/progressbar_background.png</filename>
             </imagetype>
             <imagetype name="progressimage">
-                <area>0,0,752,10</area>
+                <area>0,0,220,10</area>
                <filename>images/progressbar/progressbar_fill.png</filename>
             </imagetype>
         </progressbar>
@@ -109,7 +103,7 @@
 
     <window name="notification-image">
 
-        <area>-1,36,780,180</area>
+        <area>800,24,470,136</area>
         
         <animation trigger="AboutToShow">
             <section>
@@ -126,31 +120,31 @@
         </animation>
 
         <shape name="notification-image-backdrop" from="base_popup_backdrop">
-            <area>0,0,780,180</area>
+            <area>0,0,470,122</area>
         </shape>
 
         <shape name="notification-image-backdrop-line" from="base_backdrop_line">
-            <area>1,1,778,178</area>
+            <area>1,1,468,120</area>
         </shape>
 
         <shape name="notification-image-top-line" from="base_highlight_line">
-            <area>2,2,776,2</area>
+            <area>2,2,466,2</area>
         </shape>
 
         <shape name="notification-image-bottom-line" from="base_highlight_line">
-            <area>1,176,776,2</area>
+            <area>1,118,466,2</area>
         </shape>
 
         <shape name="notification-image-left-line" from="base_highlight_vertical_line">
-            <area>2,4,2,170</area>
+            <area>2,4,2,112</area>
         </shape>
 
         <shape name="notification-image-right-line" from="base_highlight_vertical_line">
-            <area>776,4,2,170</area>
+            <area>466,4,2,112</area>
         </shape>
 
         <shape name="image-border">
-            <area>14,14,152,152</area>
+            <area>352,4,114,114</area>
             <type>roundbox</type>
             <fill color="#000000" alpha="0" />
             <line color="#AAAAAA" alpha="100" width="2" />
@@ -163,9 +157,9 @@
             <state name="noartwork">
                 <area>0,0,100%,100%</area>
                 <imagetype name="imageartwork">
-                    <filename>images/no_artwork.png</filename>
+                    <filename>images/question.png</filename>
                     <mask>images/masks/notification_image_mask.png</mask>
-                    <area>18,18,144,144</area>
+                    <area>356,8,106,106</area>
                 </imagetype>
             </state>
         </statetype>
@@ -178,15 +172,15 @@
                 <imagetype name="imageerror">
                     <filename>images/error.png</filename>
                     <mask>images/masks/notification_image_mask.png</mask>
-                    <area>18,18,144,144</area>
+                    <area>356,8,106,106</area>
                 </imagetype>
             </state>
             <state name="check">
                 <area>0,0,100%,100%</area>
                 <imagetype name="imageerror">
-                    <filename>images/check.png</filename>
+                    <filename>images/checkmark.png</filename>
                     <mask>images/masks/notification_image_mask.png</mask>
-                    <area>18,18,144,144</area>
+                    <area>356,8,106,106</area>
                 </imagetype>
             </state>
             <state name="warning">
@@ -194,65 +188,60 @@
                 <imagetype name="imageerror">
                     <filename>images/warning.png</filename>
                     <mask>images/masks/notification_image_mask.png</mask>
-                    <area>18,18,144,144</area>
+                    <area>356,8,106,106</area>
                 </imagetype>
             </state>
             <state name="busy">
                 <area>0,0,100%,100%</area>
                 <imagetype name="imagebusy">
-                    <filename>images/busy.png</filename>
+                    <filename>images/gears.png</filename>
                     <mask>images/masks/notification_image_mask.png</mask>
-                    <area>18,18,144,144</area>
+                    <area>356,8,106,106</area>
                 </imagetype>
             </state>
         </statetype>
         
         <imagetype name="image" depends="!mediastate&amp;!errorstate">
-            <filename>images/damaged.png</filename>
+            <filename>images/error.png</filename>
             <mask>images/masks/notification_image_mask.png</mask>
-            <area>18,18,144,144</area>
+            <area>356,8,106,106</area>
         </imagetype>
         
         <textarea name="title" from="basetextarea" depends="progress">
-            <area>170,18,598,35</area>
-            <font>basemediumlargerbold</font>
+            <area>14,11,324,35</area>
+            <font>basemediumlargeryellow</font>
+            <scroll direction="left" startdelay="1"/>
         </textarea>
         
         <textarea name="title_noprogress" from="basetextarea" depends="!progress">
-            <area>170,11,598,35</area>
-            <font>basemediumlargerbold</font>
+            <area>14,11,324,35</area>
+            <font>basemediumlargeryellow</font>
+            <scroll direction="left" startdelay="1"/>
             <template>%TITLE%</template>
         </textarea>
 
         <textarea name="origin" from="basetextarea" depends="progress">
-            <area>170,53,598,30</area>
+            <area>14,46,324,30</area>
             <font>basesomewhatsmaller</font>
+            <scroll direction="left" startdelay="1"/>
+            <template>[%ORIGIN%] %DESCRIPTION%</template>
         </textarea>
         
         <textarea name="origin_noprogress" from="basetextarea" depends="!progress">
-            <area>170,46,598,30</area>
+            <area>14,46,324,30</area>
             <font>basesomewhatsmaller</font>
-            <template>%ORIGIN%</template>
+            <scroll direction="left" startdelay="1"/>
+            <template>[%ORIGIN%]</template>
         </textarea>
 
-        <textarea name="description" from="basetextarea" depends="progress">
-            <area>170,83,598,30</area>
-            <font>basesomewhatsmaller</font>
-        </textarea>
-        
         <textarea name="description_noprogress" from="basetextarea" depends="!progress">
-            <area>170,76,598,90</area>
+            <area>14,76,324,30</area>
             <font>basesomewhatsmaller</font>
-            <multiline>yes</multiline>
             <align>left,top</align>
+            <scroll direction="left" startdelay="1"/>
             <template>%DESCRIPTION%</template>
         </textarea>
 
-        <textarea name="extra" from="basetextarea" depends="progress">
-            <area>170,113,300,30</area>
-            <font>basesomewhatsmaller</font>
-        </textarea>
-        
         <textarea name="progress_text" from="basetextarea" depends="progress">
             <area>370,113,398,30</area>
             <font>basesomewhatsmaller</font>
@@ -283,12 +272,12 @@
         </shape>
 
         <statetype name="mediastate">
-            <area>0,0,100%,100%</area>
+            <area>0,0,100%,65%</area>
             <state name="ok"/>
             <state name="noartwork">
                 <area>0,0,100%,100%</area>
                 <imagetype name="imageartwork">
-                    <filename>images/no_artwork_fullscreen.png</filename>
+                    <filename>images/question.png</filename>
                     <area>0,0,100%,100%</area>
                     <preserveaspect>true</preserveaspect>
                 </imagetype>
@@ -296,12 +285,12 @@
         </statetype>
 
         <statetype name="errorstate">
-            <area>0,0,100%,100%</area>
+            <area>0,0,100%,65%</area>
             <state name="ok"/>
             <state name="error">
                 <area>0,0,100%,100%</area>
                 <imagetype name="imageerror">
-                    <filename>images/error_fullscreen.png</filename>
+                    <filename>images/error.png</filename>
                     <area>0,0,100%,100%</area>
                     <preserveaspect>true</preserveaspect>
                 </imagetype>
@@ -309,7 +298,7 @@
             <state name="check">
                 <area>0,0,100%,100%</area>
                 <imagetype name="imageerror">
-                    <filename>images/check_fullscreen.png</filename>
+                    <filename>images/checkmark.png</filename>
                     <area>0,0,100%,100%</area>
                     <preserveaspect>true</preserveaspect>
                 </imagetype>
@@ -317,7 +306,7 @@
             <state name="warning">
                 <area>0,0,100%,100%</area>
                 <imagetype name="imageerror">
-                    <filename>images/warning_fullscreen.png</filename>
+                    <filename>images/warning.png</filename>
                     <area>0,0,100%,100%</area>
                     <preserveaspect>true</preserveaspect>
                 </imagetype>
@@ -325,22 +314,16 @@
             <state name="busy">
                 <area>0,0,100%,100%</area>
                 <imagetype name="imagebusy">
-                    <filename>images/busy_fullscreen.png</filename>
+                    <filename>images/gears.png</filename>
                     <area>0,0,100%,100%</area>
                     <preserveaspect>true</preserveaspect>
                 </imagetype>
             </state>
         </statetype>
 
-        <imagetype name="image" depends="!mediastate&amp;!errorstate">
-            <filename>images/damaged_fullscreen.png</filename>
-            <area>0,0,100%,100%</area>
-            <preserveaspect>true</preserveaspect>
-        </imagetype>
-
         <textarea name="title" from="basetextarea">
             <area>170,475,940,45</area>
-            <font>baseextralargebold</font>
+            <font>baseextralargeyellow</font>
         </textarea>
 
         <textarea name="origin" from="basetextarea">