diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ActionBarBackground.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ActionBarBackground.fxg
index 4442b56..7d6130f 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ActionBarBackground.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ActionBarBackground.fxg
@@ -18,66 +18,70 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="2" scaleGridTop="2" scaleGridRight="63" scaleGridBottom="64" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- border top -->
-  <Rect x="0" y="0" width="65" height="1" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.75"/>
-    </fill>
-  </Rect>
-  <!-- border bottom -->
-  <Rect x="0" y="66" width="65" height="1" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.85"/>
-    </fill>
-  </Rect>
-  <!-- drop shadow (3 filled rects) -->
-  <Rect x="0" y="67" width="65" height="1" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.35"/>
-    </fill>
-  </Rect>
-  <Rect x="0" y="68" width="65" height="1" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.2"/>
-    </fill>
-  </Rect>
-  <Rect x="0" y="69" width="65" height="1" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.1"/>
-    </fill>
-  </Rect>
-  <!-- highlight border -->
-  <Rect x="1" y="1" width="63" height="1" alpha=".15" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#ffffff"/>
-    </fill>
-  </Rect>
-  <Rect x="1" y="65" width="63" height="1" alpha="0.1" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#ffffff"/>
-    </fill>
-  </Rect>
-  <Rect x="0" y="1" width="1" height="65" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="0" scaleX="65" rotation="90">
-        <GradientEntry color="#ffffff" ratio="0" alpha=".15"/>
-        <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <Rect x="64" y="1" width="1" height="65" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="0" scaleX="65" rotation="90">
-        <GradientEntry color="#ffffff" ratio="0" alpha=".15"/>
-        <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="0" width="65" height="70" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="2" scaleGridTop="2" scaleGridRight="63" scaleGridBottom="64">
+    
+    <!-- border top -->
+    <Rect x="0" y="0" width="65" height="1">
+        <fill>
+            <SolidColor color="#000000" alpha="0.75"/>
+        </fill>
+    </Rect>
+    <!-- border bottom -->
+    <Rect x="0" y="66" width="65" height="1">
+        <fill>
+            <SolidColor color="#000000" alpha="0.85"/>
+        </fill>
+    </Rect>
+    <!-- drop shadow (3 filled rects) -->
+    <Rect x="0" y="67" width="65" height="1">
+        <fill>
+            <SolidColor color="#000000" alpha="0.35"/>
+        </fill>
+    </Rect>
+    <Rect x="0" y="68" width="65" height="1">
+        <fill>
+            <SolidColor color="#000000" alpha="0.2"/>
+        </fill>
+    </Rect>
+    <Rect x="0" y="69" width="65" height="1">
+        <fill>
+            <SolidColor color="#000000" alpha="0.1"/>
+        </fill>
+    </Rect>
+    
+    <!-- highlight border -->
+    <Rect x="1" y="1" width="63" height="1" alpha=".15">
+        <fill>
+        	<SolidColor color="#ffffff"/>
+        </fill>
+    </Rect>
+    <Rect x="1" y="65" width="63" height="1" alpha="0.1">
+        <fill>
+        	<SolidColor color="#ffffff"/>
+        </fill>
+    </Rect>
+    <Rect x="0" y="1" width="1" height="65">
+        <fill>
+            <LinearGradient x="0" scaleX="65" rotation="90">
+                <GradientEntry color="#ffffff" ratio="0" alpha=".15"/>
+                <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+    <Rect x="64" y="1" width="1" height="65">
+        <fill>
+            <LinearGradient x="0" scaleX="65" rotation="90">
+                <GradientEntry color="#ffffff" ratio="0" alpha=".15"/>
+                <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+    
+    <!-- invisible fix for scaling -->
+    <Rect x="0" y="0" width="65" height="70">
+        <fill>
+            <SolidColor color="#ffffff" alpha="0"/>
+        </fill>
+    </Rect>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledActionButton_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledActionButton_down.fxg
index c1f6003..9c9075f 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledActionButton_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledActionButton_down.fxg
@@ -18,35 +18,44 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="6" scaleGridRight="36" scaleGridTop="6" scaleGridBottom="36" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="0" width="42" height="42" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- border -->
-  <Path winding="nonZero" data="M42 36C42 39.3135 39.3135 42 36 42L6 42C2.68652 42 0 39.3135 0 36L0 5.9541C0 2.64062 2.68652 0 6 0L36 0C39.3135 0 42 2.64062 42 5.9541L42 36ZM41 6C41 3.23877 38.7617 1 36 1L6 1C3.23877 1 1 3.23877 1 6L1 36C1 38.7617 3.23877 41 6 41L36 41C38.7617&#xD;&#xA; 41 41 38.7617 41 36L41 6Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#323232"/>
-    </fill>
-  </Path>
-  <!-- shadow fill -->
-  <Rect x="1" y="1" width="40" height="40" radiusX="5.00053" radiusY="5.00053" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="19.9995" y="0" scaleX="22.6146" rotation="90">
-        <GradientEntry ratio="0" alpha="0.25"/>
-        <GradientEntry ratio="1" alpha="0"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- inner highlight -->
-  <Path x="1" y="1" winding="nonZero" data="M35 1C37.2051 1 39 2.79443 39 5L39 35C39 37.2051 37.2051 39 35 39L5 39C2.79443 39 1 37.2051 1 35L1 5C1 2.79443 2.79443 1 5 1L35 1M35 0 5 0C2.23877 0 0 2.23877 0 5L0 35C0 37.7617 2.23877 40 5 40L35 40C37.7617 40 40 37.7617 40 35L40 5C40 2.23877&#xD;&#xA; 37.7617 0 35 0L35 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="19.9995" y="1" scaleX="38.0005" rotation="90">
-        <GradientEntry ratio="0" color="#FFFFFF" alpha="0.05"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="6" scaleGridRight="36" scaleGridTop="6" scaleGridBottom="36">
+
+    <!-- invisible fix for scaling -->
+    <Rect x="0" y="0" width="42" height="42">
+        <fill>
+            <SolidColor color="#ffffff" alpha="0"/>
+        </fill>
+    </Rect>
+
+
+    <!-- border -->
+      <Path winding="nonZero" data="M42 36C42 39.3135 39.3135 42 36 42L6 42C2.68652 42 0 39.3135 0 36L0 5.9541C0 2.64062 2.68652 0 6 0L36 0C39.3135 0 42 2.64062 42 5.9541L42 36ZM41 6C41 3.23877 38.7617 1 36 1L6 1C3.23877 1 1 3.23877 1 6L1 36C1 38.7617 3.23877 41 6 41L36 41C38.7617
+ 41 41 38.7617 41 36L41 6Z">
+        <fill>
+          <SolidColor color="#323232"/>
+        </fill>
+      </Path>
+
+    <!-- shadow fill -->
+      <Rect x="1" y="1" width="40" height="40" radiusX="5.00053" radiusY="5.00053">
+        <fill>
+          <LinearGradient x="19.9995" y="0" scaleX="22.6146" rotation="90">
+            <GradientEntry ratio="0" alpha="0.25"/>
+            <GradientEntry ratio="1" alpha="0"/>
+          </LinearGradient>
+        </fill>
+      </Rect>
+
+    <!-- inner highlight -->
+      <Path x="1" y="1" winding="nonZero" data="M35 1C37.2051 1 39 2.79443 39 5L39 35C39 37.2051 37.2051 39 35 39L5 39C2.79443 39 1 37.2051 1 35L1 5C1 2.79443 2.79443 1 5 1L35 1M35 0 5 0C2.23877 0 0 2.23877 0 5L0 35C0 37.7617 2.23877 40 5 40L35 40C37.7617 40 40 37.7617 40 35L40 5C40 2.23877
+ 37.7617 0 35 0L35 0Z">
+        <fill>
+          <LinearGradient x="19.9995" y="1" scaleX="38.0005" rotation="90">
+            <GradientEntry ratio="0" color="#FFFFFF" alpha="0.05"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledActionButton_fill.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledActionButton_fill.fxg
index ed6350f..987e634 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledActionButton_fill.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledActionButton_fill.fxg
@@ -18,17 +18,21 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="6" scaleGridRight="36" scaleGridTop="6" scaleGridBottom="36" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="0" width="42" height="42" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- chromeColor fill -->
-  <Rect x="1" y="1" width="40" height="40" radiusX="5.00053" radiusY="5.00053" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#484848"/>
-    </fill>
-  </Rect>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="6" scaleGridRight="36" scaleGridTop="6" scaleGridBottom="36">
+
+    <!-- invisible fix for scaling -->
+    <Rect x="0" y="0" width="42" height="42">
+        <fill>
+            <SolidColor color="#ffffff" alpha="0"/>
+        </fill>
+    </Rect>
+
+    <!-- chromeColor fill -->
+      <Rect x="1" y="1" width="40" height="40" radiusX="5.00053" radiusY="5.00053">
+        <fill>
+          <SolidColor color="#484848"/>
+        </fill>
+      </Rect>
+      
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledActionButton_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledActionButton_up.fxg
index 620d779..f97a280 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledActionButton_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledActionButton_up.fxg
@@ -18,37 +18,46 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="6" scaleGridRight="36" scaleGridTop="6" scaleGridBottom="36" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="0" width="42" height="42" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- border -->
-  <Path winding="nonZero" data="M42 36C42 39.3135 39.3135 42 36 42L6 42C2.68652 42 0 39.3135 0 36L0 5.9541C0 2.64062 2.68652 0 6 0L36 0C39.3135 0 42 2.64062 42 5.9541L42 36ZM41 6C41 3.23877 38.7617 1 36 1L6 1C3.23877 1 1 3.23877 1 6L1 36C1 38.7617 3.23877 41 6 41L36 41C38.7617&#xD;&#xA; 41 41 38.7617 41 36L41 6Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#323232"/>
-    </fill>
-  </Path>
-  <!-- shadow fill -->
-  <Rect x="1" y="1" width="40" height="40" radiusX="5.00053" radiusY="5.00053" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="19.9995" y="0" scaleX="40.0005" rotation="90">
-        <GradientEntry ratio="0" color="#FFFFFF" alpha="0.4"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- inner highlight -->
-  <Path x="1" y="1" winding="nonZero" data="M35 1C37.2051 1 39 2.79443 39 5L39 35C39 37.2051 37.2051 39 35 39L5 39C2.79443 39 1 37.2051 1 35L1 5C1 2.79443 2.79443 1 5 1L35 1M35 0 5 0C2.23877 0 0 2.23877 0 5L0 35C0 37.7617 2.23877 40 5 40L35 40C37.7617 40 40 37.7617 40 35L40 5C40 2.23877&#xD;&#xA; 37.7617 0 35 0L35 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="19.9995" y="0" scaleX="40.0005" rotation="90">
-        <GradientEntry ratio="0" alpha="0.35"/>
-        <GradientEntry ratio="0.662577" alpha="0.1"/>
-        <GradientEntry ratio="0.871166" color="#FFFFFF" alpha="0.05"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.2"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="6" scaleGridRight="36" scaleGridTop="6" scaleGridBottom="36">
+
+    <!-- invisible fix for scaling -->
+    <Rect x="0" y="0" width="42" height="42">
+        <fill>
+            <SolidColor color="#ffffff" alpha="0"/>
+        </fill>
+    </Rect>
+
+
+    <!-- border -->
+      <Path winding="nonZero" data="M42 36C42 39.3135 39.3135 42 36 42L6 42C2.68652 42 0 39.3135 0 36L0 5.9541C0 2.64062 2.68652 0 6 0L36 0C39.3135 0 42 2.64062 42 5.9541L42 36ZM41 6C41 3.23877 38.7617 1 36 1L6 1C3.23877 1 1 3.23877 1 6L1 36C1 38.7617 3.23877 41 6 41L36 41C38.7617
+ 41 41 38.7617 41 36L41 6Z">
+        <fill>
+          <SolidColor color="#323232"/>
+        </fill>
+      </Path>
+
+    <!-- shadow fill -->
+      <Rect x="1" y="1" width="40" height="40" radiusX="5.00053" radiusY="5.00053">
+        <fill>
+          <LinearGradient x="19.9995" y="0" scaleX="40.0005" rotation="90">
+            <GradientEntry ratio="0" color="#FFFFFF" alpha="0.4"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/>
+          </LinearGradient>
+        </fill>
+      </Rect>
+
+    <!-- inner highlight -->
+      <Path x="1" y="1" winding="nonZero" data="M35 1C37.2051 1 39 2.79443 39 5L39 35C39 37.2051 37.2051 39 35 39L5 39C2.79443 39 1 37.2051 1 35L1 5C1 2.79443 2.79443 1 5 1L35 1M35 0 5 0C2.23877 0 0 2.23877 0 5L0 35C0 37.7617 2.23877 40 5 40L35 40C37.7617 40 40 37.7617 40 35L40 5C40 2.23877
+ 37.7617 0 35 0L35 0Z">
+        <fill>
+          <LinearGradient x="19.9995" y="0" scaleX="40.0005" rotation="90">
+            <GradientEntry ratio="0" alpha="0.35"/>
+            <GradientEntry ratio="0.662577" alpha="0.1"/>
+            <GradientEntry ratio="0.871166" color="#FFFFFF" alpha="0.05"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.2"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledBackButton_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledBackButton_down.fxg
index 41da41a..923f8d3 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledBackButton_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledBackButton_down.fxg
@@ -18,35 +18,45 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="20" scaleGridRight="80" scaleGridTop="6" scaleGridBottom="36" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="0" width="87" height="42" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- border -->
-  <Path winding="nonZero" data="M81 1C83.7568 1 86 3.24316 86 6L86 36C86 38.7568 83.7568 41 81 41L19.0337 41.001C15.2959 41.001 13.3623 36.8662 12.1064 35.6104 12.0649 35.5498 5.34229 26.6387 1.5 20.8906 5.34668 15.1328 12.1392 6.30762 12.1753 6.25586 14.4209 3.43457 15.813&#xD;&#xA; 1 19 1L81 1 81 1ZM19 0C14.8569 0 14.0151 1.91504 11.3584 5.67871 11.3584 5.67871 4 15 0 21 4 27 11.2847 36.1797 11.2847 36.1797 14.2847 40.1797 15 42 19 42L81 42C84.3135 42 87 39.3135 87 36L87 6C87 2.68652 84.3135 0 81 0L19 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#323232"/>
-    </fill>
-  </Path>
-  <!-- shadow fill -->
-  <Path x="1.5" y="1" winding="nonZero" data="M79.5 0C82.2568 0 84.5 2.24316 84.5 5L84.5 35C84.5 37.7568 82.2568 40 79.5 40L17.5337 40.001C13.7959 40.001 11.8623 35.8662 10.6064 34.6104 10.5649 34.5498 3.84229 25.6387 0 19.8906 3.84668 14.1328 10.6392 5.30762 10.6753 5.25586 12.9209 2.43457&#xD;&#xA; 14.5 0 17.5 0L79.5 0 79.5 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="42.2495" y="0" scaleX="22.6145" rotation="90">
-        <GradientEntry ratio="0" alpha="0.25"/>
-        <GradientEntry ratio="1" alpha="0"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- highlight border -->
-  <Path x="1.5" y="0.999023" winding="nonZero" data="M79.5 1C81.7051 1 83.5 2.79395 83.5 5L83.5 35C83.5 37.2061 81.7051 39.001 79.5 39.001L17.5337 39.001C14.7188 39.001 11.3052 33.8457 11.3052 33.8457 8.83691 29.9521 3.33154 23.0889 1.20215 19.8906 3.3042 16.7393 11.4839 5.8457 11.4839 5.8457 11.8906&#xD;&#xA; 5.26562 14.7344 1 17.5 1L79.5 1M17.1719 0C14.375 0 12.313 3.19824 10.6753 5.25586 10.6392 5.30762 3.84668 14.1328 0 19.8906 3.84229 25.6387 10.5649 34.5498 10.6064 34.6104 11.8623 35.8662 13.7959 40.001 17.5337 40.001L79.5 40.001C82.2568 40.001&#xD;&#xA; 84.5 37.7568 84.5 35L84.5 5C84.5 2.24316 82.2568 0 79.375 0L17.1719 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="42.2495" y="0" scaleX="42.7844" rotation="90">
-        <GradientEntry ratio="0" color="#FFFFFF" alpha="0.05"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+	scaleGridLeft="20" scaleGridRight="80" scaleGridTop="6" scaleGridBottom="36">
+
+	<!-- invisible fix for scaling -->
+	<Rect x="0" y="0" width="87" height="42">
+		<fill>
+			<SolidColor color="#ffffff" alpha="0"/>
+		</fill>
+	</Rect>
+
+	<!-- border -->
+      <Path winding="nonZero" data="M81 1C83.7568 1 86 3.24316 86 6L86 36C86 38.7568 83.7568 41 81 41L19.0337 41.001C15.2959 41.001 13.3623 36.8662 12.1064 35.6104 12.0649 35.5498 5.34229 26.6387 1.5 20.8906 5.34668 15.1328 12.1392 6.30762 12.1753 6.25586 14.4209 3.43457 15.813
+ 1 19 1L81 1 81 1ZM19 0C14.8569 0 14.0151 1.91504 11.3584 5.67871 11.3584 5.67871 4 15 0 21 4 27 11.2847 36.1797 11.2847 36.1797 14.2847 40.1797 15 42 19 42L81 42C84.3135 42 87 39.3135 87 36L87 6C87 2.68652 84.3135 0 81 0L19 0Z">
+        <fill>
+          <SolidColor color="#323232"/>
+        </fill>
+      </Path>
+
+	<!-- shadow fill -->
+      <Path x="1.5" y="1" winding="nonZero" data="M79.5 0C82.2568 0 84.5 2.24316 84.5 5L84.5 35C84.5 37.7568 82.2568 40 79.5 40L17.5337 40.001C13.7959 40.001 11.8623 35.8662 10.6064 34.6104 10.5649 34.5498 3.84229 25.6387 0 19.8906 3.84668 14.1328 10.6392 5.30762 10.6753 5.25586 12.9209 2.43457
+ 14.5 0 17.5 0L79.5 0 79.5 0Z">
+        <fill>
+          <LinearGradient x="42.2495" y="0" scaleX="22.6145" rotation="90">
+            <GradientEntry ratio="0" alpha="0.25"/>
+            <GradientEntry ratio="1" alpha="0"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+
+	<!-- highlight border -->
+      <Path x="1.5" y="0.999023" winding="nonZero" data="M79.5 1C81.7051 1 83.5 2.79395 83.5 5L83.5 35C83.5 37.2061 81.7051 39.001 79.5 39.001L17.5337 39.001C14.7188 39.001 11.3052 33.8457 11.3052 33.8457 8.83691 29.9521 3.33154 23.0889 1.20215 19.8906 3.3042 16.7393 11.4839 5.8457 11.4839 5.8457 11.8906
+ 5.26562 14.7344 1 17.5 1L79.5 1M17.1719 0C14.375 0 12.313 3.19824 10.6753 5.25586 10.6392 5.30762 3.84668 14.1328 0 19.8906 3.84229 25.6387 10.5649 34.5498 10.6064 34.6104 11.8623 35.8662 13.7959 40.001 17.5337 40.001L79.5 40.001C82.2568 40.001
+ 84.5 37.7568 84.5 35L84.5 5C84.5 2.24316 82.2568 0 79.375 0L17.1719 0Z">
+        <fill>
+          <LinearGradient x="42.2495" y="0" scaleX="42.7844" rotation="90">
+            <GradientEntry ratio="0" color="#FFFFFF" alpha="0.05"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledBackButton_fill.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledBackButton_fill.fxg
index 02f69e3..4fb534a 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledBackButton_fill.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledBackButton_fill.fxg
@@ -18,17 +18,22 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="20" scaleGridRight="80" scaleGridTop="6" scaleGridBottom="36" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="0" width="87" height="42" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- chromeColor fill -->
-  <Path x="1.5" y="1" winding="nonZero" data="M79.5 0C82.2568 0 84.5 2.24316 84.5 5L84.5 35C84.5 37.7568 82.2568 40 79.5 40L17.5337 40.001C13.7959 40.001 11.8623 35.8662 10.6064 34.6104 10.5649 34.5498 3.84229 25.6387 0 19.8906 3.84668 14.1328 10.6392 5.30762 10.6753 5.25586 12.9209 2.43457&#xD;&#xA; 14.313 0 17.5 0L79.5 0 79.5 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#484848"/>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+	scaleGridLeft="20" scaleGridRight="80" scaleGridTop="6" scaleGridBottom="36">
+
+	<!-- invisible fix for scaling -->
+	<Rect x="0" y="0" width="87" height="42">
+		<fill>
+			<SolidColor color="#ffffff" alpha="0"/>
+		</fill>
+	</Rect>
+
+	<!-- chromeColor fill -->
+      <Path x="1.5" y="1" winding="nonZero" data="M79.5 0C82.2568 0 84.5 2.24316 84.5 5L84.5 35C84.5 37.7568 82.2568 40 79.5 40L17.5337 40.001C13.7959 40.001 11.8623 35.8662 10.6064 34.6104 10.5649 34.5498 3.84229 25.6387 0 19.8906 3.84668 14.1328 10.6392 5.30762 10.6753 5.25586 12.9209 2.43457
+ 14.313 0 17.5 0L79.5 0 79.5 0Z">
+        <fill>
+          <SolidColor color="#484848"/>
+        </fill>
+      </Path>
+
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledBackButton_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledBackButton_up.fxg
index 55ad341..63adf4e 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledBackButton_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledBackButton_up.fxg
@@ -18,37 +18,47 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="20" scaleGridRight="80" scaleGridTop="6" scaleGridBottom="36" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="0" width="87" height="42" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- border -->
-  <Path winding="nonZero" data="M81 1C83.7568 1 86 3.24316 86 6L86 36C86 38.7568 83.7568 41 81 41L19.0337 41.001C15.2959 41.001 13.3623 36.8662 12.1064 35.6104 12.0649 35.5498 5.34229 26.6387 1.5 20.8906 5.34668 15.1328 12.1392 6.30762 12.1753 6.25586 14.4209 3.43457 15.813&#xD;&#xA; 1 19 1L81 1 81 1ZM19 0C14.8569 0 14.0151 1.91504 11.3584 5.67871 11.3584 5.67871 4 15 0 21 4 27 11.2847 36.1797 11.2847 36.1797 14.2847 40.1797 15 42 19 42L81 42C84.3135 42 87 39.3135 87 36L87 6C87 2.68652 84.3135 0 81 0L19 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#323232"/>
-    </fill>
-  </Path>
-  <!-- shadow fill -->
-  <Path x="1.5" y="1" winding="nonZero" data="M79.5 0C82.2568 0 84.5 2.24316 84.5 5L84.5 35C84.5 37.7568 82.2568 40 79.5 40L17.5337 40.001C13.7959 40.001 11.8623 35.8662 10.6064 34.6104 10.5649 34.5498 3.84229 25.6387 0 19.8906 3.84668 14.1328 10.6392 5.30762 10.6753 5.25586 12.9209 2.43457&#xD;&#xA; 14.5 0 17.5 0L79.5 0 79.5 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="42.2495" y="-0.784668" scaleX="40.6027" rotation="90">
-        <GradientEntry ratio="0" color="#FFFFFF" alpha="0.4"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- highlight border -->
-  <Path x="1.5" y="0.999023" winding="nonZero" data="M79.5 1C81.7051 1 83.5 2.79395 83.5 5L83.5 35C83.5 37.2061 81.7051 39.001 79.5 39.001L17.5337 39.001C14.7188 39.001 11.3052 33.8457 11.3052 33.8457 8.83691 29.9521 3.33154 23.0889 1.20215 19.8906 3.3042 16.7393 11.4839 5.8457 11.4839 5.8457 11.8906&#xD;&#xA; 5.26562 14.7344 1 17.5 1L79.5 1M17.1719 0C14.375 0 12.313 3.19824 10.6753 5.25586 10.6392 5.30762 3.84668 14.1328 0 19.8906 3.84229 25.6387 10.5649 34.5498 10.6064 34.6104 11.8623 35.8662 13.7959 40.001 17.5337 40.001L79.5 40.001C82.2568 40.001&#xD;&#xA; 84.5 37.7568 84.5 35L84.5 5C84.5 2.24316 82.2568 0 79.375 0L17.1719 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="42.2495" y="0" scaleX="40.0015" rotation="90">
-        <GradientEntry ratio="0" alpha="0.35"/>
-        <GradientEntry ratio="0.662577" alpha="0.1"/>
-        <GradientEntry ratio="0.871166" color="#FFFFFF" alpha="0.05"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.2"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+	scaleGridLeft="20" scaleGridRight="80" scaleGridTop="6" scaleGridBottom="36">
+
+	<!-- invisible fix for scaling -->
+	<Rect x="0" y="0" width="87" height="42">
+		<fill>
+			<SolidColor color="#ffffff" alpha="0"/>
+		</fill>
+	</Rect>
+
+	<!-- border -->
+      <Path winding="nonZero" data="M81 1C83.7568 1 86 3.24316 86 6L86 36C86 38.7568 83.7568 41 81 41L19.0337 41.001C15.2959 41.001 13.3623 36.8662 12.1064 35.6104 12.0649 35.5498 5.34229 26.6387 1.5 20.8906 5.34668 15.1328 12.1392 6.30762 12.1753 6.25586 14.4209 3.43457 15.813
+ 1 19 1L81 1 81 1ZM19 0C14.8569 0 14.0151 1.91504 11.3584 5.67871 11.3584 5.67871 4 15 0 21 4 27 11.2847 36.1797 11.2847 36.1797 14.2847 40.1797 15 42 19 42L81 42C84.3135 42 87 39.3135 87 36L87 6C87 2.68652 84.3135 0 81 0L19 0Z">
+        <fill>
+          <SolidColor color="#323232"/>
+        </fill>
+      </Path>
+
+	<!-- shadow fill -->
+      <Path x="1.5" y="1" winding="nonZero" data="M79.5 0C82.2568 0 84.5 2.24316 84.5 5L84.5 35C84.5 37.7568 82.2568 40 79.5 40L17.5337 40.001C13.7959 40.001 11.8623 35.8662 10.6064 34.6104 10.5649 34.5498 3.84229 25.6387 0 19.8906 3.84668 14.1328 10.6392 5.30762 10.6753 5.25586 12.9209 2.43457
+ 14.5 0 17.5 0L79.5 0 79.5 0Z">
+        <fill>
+          <LinearGradient x="42.2495" y="-0.784668" scaleX="40.6027" rotation="90">
+            <GradientEntry ratio="0" color="#FFFFFF" alpha="0.4"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+
+	<!-- highlight border -->
+      <Path x="1.5" y="0.999023" winding="nonZero" data="M79.5 1C81.7051 1 83.5 2.79395 83.5 5L83.5 35C83.5 37.2061 81.7051 39.001 79.5 39.001L17.5337 39.001C14.7188 39.001 11.3052 33.8457 11.3052 33.8457 8.83691 29.9521 3.33154 23.0889 1.20215 19.8906 3.3042 16.7393 11.4839 5.8457 11.4839 5.8457 11.8906
+ 5.26562 14.7344 1 17.5 1L79.5 1M17.1719 0C14.375 0 12.313 3.19824 10.6753 5.25586 10.6392 5.30762 3.84668 14.1328 0 19.8906 3.84229 25.6387 10.5649 34.5498 10.6064 34.6104 11.8623 35.8662 13.7959 40.001 17.5337 40.001L79.5 40.001C82.2568 40.001
+ 84.5 37.7568 84.5 35L84.5 5C84.5 2.24316 82.2568 0 79.375 0L17.1719 0Z">
+        <fill>
+          <LinearGradient x="42.2495" y="0" scaleX="40.0015" rotation="90">
+            <GradientEntry ratio="0" alpha="0.35"/>
+            <GradientEntry ratio="0.662577" alpha="0.1"/>
+            <GradientEntry ratio="0.871166" color="#FFFFFF" alpha="0.05"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.2"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarFirstButton_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarFirstButton_down.fxg
index c663055..56991b4 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarFirstButton_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarFirstButton_down.fxg
@@ -18,32 +18,40 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="9" scaleGridTop="9" scaleGridRight="116" scaleGridBottom="51" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- shadow fill -->
-  <Path data="M120 60 8.06641 60C3.6123 60 0 56.3574 0 51.8652L0 8.13525C0 3.64258 3.6123 0 8.06641 0L120 0 120 60Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="59.9995" y="1.03467" scaleX="58.029" rotation="90">
-        <GradientEntry ratio="0" alpha="0.14902"/>
-        <GradientEntry ratio="1" alpha="0.34902"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- border -->
-  <Path winding="nonZero" data="M118.991 1.01709 118.991 58.9834 8.06641 58.9834C4.1748 58.9834 1.00879 55.7891 1.00879 51.8652L1.00879 8.13525C1.00879 4.21045 4.1748 1.01709 8.06641 1.01709L118.991 1.01709ZM120 0 8.06641 0C3.6123 0 0 3.64258 0 8.13525L0 51.8652C0 56.3574 3.6123&#xD;&#xA; 60 8.06641 60L120 60 120 0 120 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#464646"/>
-    </fill>
-  </Path>
-  <!-- outer shadow -->
-  <Path x="1" y="1.02002" winding="nonZero" data="M116.976 1.0166 116.976 56.9487 7.05859 56.9487C3.72266 56.9487 1.00879 54.2124 1.00879 50.8481L1.00879 7.11816C1.00879 3.75342 3.72266 1.0166 7.05859 1.0166L116.976 1.0166ZM117.983 0 7.05859 0C3.16602 0 0 3.19238 0 7.11816L0 50.8481C0 54.7729&#xD;&#xA; 3.16602 57.9663 7.05859 57.9663L117.983 57.9663 117.983 0 117.983 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.2"/>
-    </fill>
-  </Path>
-  <!-- inner shadow -->
-  <Path x="2.0166" y="2.03369" winding="nonZero" data="M114.975 1 114.967 54.9321 6.0498 54.9321C3.26514 54.9321 1 52.644 1 49.8315L1 6.10156C1 3.28857 3.26514 1 6.0498 1L114.975 1ZM115.975 0 115.967 0 6.0498 0C2.71387 0 0 2.73682 0 6.10156L0 49.8315C0 53.1958 2.71387 55.9321 6.0498 55.9321L115.967&#xD;&#xA; 55.9321 115.975 0 115.975 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.1"/>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="9" scaleGridTop="9" scaleGridRight="116" scaleGridBottom="51">
+    
+      <!-- shadow fill -->
+      <Path data="M120 60 8.06641 60C3.6123 60 0 56.3574 0 51.8652L0 8.13525C0 3.64258 3.6123 0 8.06641 0L120 0 120 60Z">
+        <fill>
+          <LinearGradient x="59.9995" y="1.03467" scaleX="58.029" rotation="90">
+            <GradientEntry ratio="0" alpha="0.14902"/>
+            <GradientEntry ratio="1" alpha="0.34902"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      
+      <!-- border -->
+      <Path winding="nonZero" data="M118.991 1.01709 118.991 58.9834 8.06641 58.9834C4.1748 58.9834 1.00879 55.7891 1.00879 51.8652L1.00879 8.13525C1.00879 4.21045 4.1748 1.01709 8.06641 1.01709L118.991 1.01709ZM120 0 8.06641 0C3.6123 0 0 3.64258 0 8.13525L0 51.8652C0 56.3574 3.6123
+ 60 8.06641 60L120 60 120 0 120 0Z">
+        <fill>
+          <SolidColor color="#464646"/>
+        </fill>
+      </Path>
+      
+      <!-- outer shadow -->
+      <Path x="1" y="1.02002" winding="nonZero" data="M116.976 1.0166 116.976 56.9487 7.05859 56.9487C3.72266 56.9487 1.00879 54.2124 1.00879 50.8481L1.00879 7.11816C1.00879 3.75342 3.72266 1.0166 7.05859 1.0166L116.976 1.0166ZM117.983 0 7.05859 0C3.16602 0 0 3.19238 0 7.11816L0 50.8481C0 54.7729
+ 3.16602 57.9663 7.05859 57.9663L117.983 57.9663 117.983 0 117.983 0Z">
+        <fill>
+          <SolidColor color="#000000" alpha="0.2"/>
+        </fill>
+      </Path>
+      
+      <!-- inner shadow -->
+      <Path x="2.0166" y="2.03369" winding="nonZero" data="M114.975 1 114.967 54.9321 6.0498 54.9321C3.26514 54.9321 1 52.644 1 49.8315L1 6.10156C1 3.28857 3.26514 1 6.0498 1L114.975 1ZM115.975 0 115.967 0 6.0498 0C2.71387 0 0 2.73682 0 6.10156L0 49.8315C0 53.1958 2.71387 55.9321 6.0498 55.9321L115.967
+ 55.9321 115.975 0 115.975 0Z">
+        <fill>
+          <SolidColor color="#000000" alpha="0.1"/>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarFirstButton_selected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarFirstButton_selected.fxg
index 20033bc..612f39b 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarFirstButton_selected.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarFirstButton_selected.fxg
@@ -18,32 +18,40 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="9" scaleGridTop="9" scaleGridRight="116" scaleGridBottom="51" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- shadow fill -->
-  <Path data="M120 60 8.06641 60C3.6123 60 0 56.3574 0 51.8652L0 8.13477C0 3.64258 3.6123 0 8.06641 0L120 0 120 60Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="59.9995" y="1.03467" scaleX="58.029" rotation="90">
-        <GradientEntry ratio="0" alpha="0.047059"/>
-        <GradientEntry ratio="1" alpha="0.247059"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- border -->
-  <Path winding="nonZero" data="M118.991 1.01758 118.991 58.9834 8.06641 58.9834C4.1748 58.9834 1.00879 55.7891 1.00879 51.8652L1.00879 8.13477C1.00879 4.21094 4.1748 1.01758 8.06641 1.01758L118.991 1.01758ZM120 0 8.06641 0C3.6123 0 0 3.64258 0 8.13477L0 51.8652C0 56.3574 3.6123&#xD;&#xA; 60 8.06641 60L120 60 120 0 120 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#646464"/>
-    </fill>
-  </Path>
-  <!-- outer shadow -->
-  <Path x="1" y="1.01953" winding="nonZero" data="M116.976 1.01758 116.976 56.9492 7.05859 56.9492C3.72266 56.9492 1.00879 54.2129 1.00879 50.8486L1.00879 7.11914C1.00879 3.75391 3.72266 1.01758 7.05859 1.01758L116.976 1.01758ZM117.983 0 7.05859 0C3.16602 0 0 3.19336 0 7.11914L0 50.8486C0 54.7734&#xD;&#xA; 3.16602 57.9668 7.05859 57.9668L117.983 57.9668 117.983 0 117.983 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.2"/>
-    </fill>
-  </Path>
-  <!-- inner shadow -->
-  <Path x="2.0166" y="2.0332" winding="nonZero" data="M114.975 1 114.967 54.9326 6.0498 54.9326C3.26514 54.9326 1 52.6445 1 49.832L1 6.10156C1 3.28857 3.26514 1 6.0498 1L114.975 1ZM115.975 0 6.0498 0C2.71387 0 0 2.7373 0 6.10156L0 49.832C0 53.1963 2.71387 55.9326 6.0498 55.9326L115.967 55.9326 115.975&#xD;&#xA; 0 115.975 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.1"/>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="9" scaleGridTop="9" scaleGridRight="116" scaleGridBottom="51">
+    
+      <!-- shadow fill -->
+      <Path data="M120 60 8.06641 60C3.6123 60 0 56.3574 0 51.8652L0 8.13477C0 3.64258 3.6123 0 8.06641 0L120 0 120 60Z">
+        <fill>
+          <LinearGradient x="59.9995" y="1.03467" scaleX="58.029" rotation="90">
+            <GradientEntry ratio="0" alpha="0.047059"/>
+            <GradientEntry ratio="1" alpha="0.247059"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      
+      <!-- border -->
+      <Path winding="nonZero" data="M118.991 1.01758 118.991 58.9834 8.06641 58.9834C4.1748 58.9834 1.00879 55.7891 1.00879 51.8652L1.00879 8.13477C1.00879 4.21094 4.1748 1.01758 8.06641 1.01758L118.991 1.01758ZM120 0 8.06641 0C3.6123 0 0 3.64258 0 8.13477L0 51.8652C0 56.3574 3.6123
+ 60 8.06641 60L120 60 120 0 120 0Z">
+        <fill>
+          <SolidColor color="#646464"/>
+        </fill>
+      </Path>
+      
+      <!-- outer shadow -->
+      <Path x="1" y="1.01953" winding="nonZero" data="M116.976 1.01758 116.976 56.9492 7.05859 56.9492C3.72266 56.9492 1.00879 54.2129 1.00879 50.8486L1.00879 7.11914C1.00879 3.75391 3.72266 1.01758 7.05859 1.01758L116.976 1.01758ZM117.983 0 7.05859 0C3.16602 0 0 3.19336 0 7.11914L0 50.8486C0 54.7734
+ 3.16602 57.9668 7.05859 57.9668L117.983 57.9668 117.983 0 117.983 0Z">
+        <fill>
+          <SolidColor color="#000000" alpha="0.2"/>
+        </fill>
+      </Path>
+      
+      <!-- inner shadow -->
+      <Path x="2.0166" y="2.0332" winding="nonZero" data="M114.975 1 114.967 54.9326 6.0498 54.9326C3.26514 54.9326 1 52.6445 1 49.832L1 6.10156C1 3.28857 3.26514 1 6.0498 1L114.975 1ZM115.975 0 6.0498 0C2.71387 0 0 2.7373 0 6.10156L0 49.832C0 53.1963 2.71387 55.9326 6.0498 55.9326L115.967 55.9326 115.975
+ 0 115.975 0Z">
+        <fill>
+          <SolidColor color="#000000" alpha="0.1"/>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarFirstButton_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarFirstButton_up.fxg
index 48cb144..2430a75 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarFirstButton_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarFirstButton_up.fxg
@@ -18,26 +18,31 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="9" scaleGridTop="9" scaleGridRight="116" scaleGridBottom="51" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- highlight fill -->
-  <Path data="M120 60 7.93359 60C3.55273 60 0 56.4766 0 52.1309L0 7.86865C0 3.52295 3.55273 0 7.93359 0L120 0 120 60Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="59.9995" y="0.51709" scaleX="32.2191" rotation="90">
-        <GradientEntry ratio="0" color="#FFFFFF" alpha="0.698039"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.047059"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- border -->
-  <Path winding="nonZero" data="M119.008 0.983398 119.008 59.0166 7.93359 59.0166C4.10645 59.0166 0.992188 55.9277 0.992188 52.1309L0.992188 7.86865C0.992188 4.07227 4.10645 0.983398 7.93359 0.983398L119.008 0.983398ZM120 0 7.93359 0C3.55273 0 0 3.52295 0 7.86865L0 52.1309C0&#xD;&#xA; 56.4766 3.55273 60 7.93359 60L120 60 120 0 120 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#646464"/>
-    </fill>
-  </Path>
-  <!-- right separator highlight -->
-  <Rect x="118" y="1" width="1" height="58" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#FFFFFF" alpha="0.2"/>
-    </fill>
-  </Rect>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="9" scaleGridTop="9" scaleGridRight="116" scaleGridBottom="51">
+    
+      <!-- highlight fill -->
+      <Path data="M120 60 7.93359 60C3.55273 60 0 56.4766 0 52.1309L0 7.86865C0 3.52295 3.55273 0 7.93359 0L120 0 120 60Z">
+        <fill>
+          <LinearGradient x="59.9995" y="0.51709" scaleX="32.2191" rotation="90">
+            <GradientEntry ratio="0" color="#FFFFFF" alpha="0.698039"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.047059"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      
+      <!-- border -->
+      <Path winding="nonZero" data="M119.008 0.983398 119.008 59.0166 7.93359 59.0166C4.10645 59.0166 0.992188 55.9277 0.992188 52.1309L0.992188 7.86865C0.992188 4.07227 4.10645 0.983398 7.93359 0.983398L119.008 0.983398ZM120 0 7.93359 0C3.55273 0 0 3.52295 0 7.86865L0 52.1309C0
+ 56.4766 3.55273 60 7.93359 60L120 60 120 0 120 0Z">
+        <fill>
+          <SolidColor color="#646464"/>
+        </fill>
+      </Path>
+      
+      <!-- right separator highlight -->
+      <Rect x="118" y="1" width="1" height="58">
+        <fill>
+          <SolidColor color="#FFFFFF" alpha="0.2"/>
+        </fill>
+      </Rect>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarLastButton_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarLastButton_down.fxg
index eefd82a..4a8d3f4 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarLastButton_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarLastButton_down.fxg
@@ -18,32 +18,40 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="4" scaleGridTop="4" scaleGridRight="111" scaleGridBottom="51" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- shadow fill -->
-  <Path data="M0 0 111.934 0C116.388 0 120 3.64258 120 8.13525L120 51.8652C120 56.3574 116.388 60 111.934 60L0 60 0 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="59.9995" y="1.03467" scaleX="58.028" rotation="90">
-        <GradientEntry ratio="0" alpha="0.14902"/>
-        <GradientEntry ratio="1" alpha="0.34902"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- outer shadow -->
-  <Path y="1.02002" winding="nonZero" data="M1 1.0166 111.941 1.0166C115.277 1.0166 117.991 3.75342 117.991 7.11816L117.991 50.8481C117.991 54.2124 115.277 56.9487 111.941 56.9487L1 56.9487M0 0 0 57.9663 111.941 57.9663C115.834 57.9663 119 54.7729 119 50.8481L119 7.11816C119 3.19238 115.834&#xD;&#xA; 0 111.941 0L0 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.2"/>
-    </fill>
-  </Path>
-  <!-- inner shadow -->
-  <Path x="1" y="2.03369" winding="nonZero" data="M110.934 1C113.718 1 115.983 3.28857 115.983 6.10156L115.983 49.8315C115.983 52.644 113.718 54.9321 110.934 54.9321L1 54.9321 1 1 110.934 1ZM110.934 0 0 0 0 55.9321 110.934 55.9321C114.27 55.9321 116.983 53.1958 116.983 49.8315L116.983 6.10156&#xD;&#xA;C116.983 2.73682 114.27 0 110.934 0L110.934 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.1"/>
-    </fill>
-  </Path>
-  <!-- border -->
-  <Path winding="nonZero" data="M112.066 0 0 0 0 0.983398 112.066 0.983398C115.894 0.983398 119.008 4.07227 119.008 7.86865L119.008 52.1309C119.008 55.9277 115.894 59.0166 112.066 59.0166L0 59.0166 0 60 112.066 60C116.447 60 120 56.4766 120 52.1309L120 7.86865C120 3.52295 116.447&#xD;&#xA; 0 112.066 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#464646"/>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="4" scaleGridTop="4" scaleGridRight="111" scaleGridBottom="51">
+    
+      <!-- shadow fill -->
+      <Path data="M0 0 111.934 0C116.388 0 120 3.64258 120 8.13525L120 51.8652C120 56.3574 116.388 60 111.934 60L0 60 0 0Z">
+        <fill>
+          <LinearGradient x="59.9995" y="1.03467" scaleX="58.028" rotation="90">
+            <GradientEntry ratio="0" alpha="0.14902"/>
+            <GradientEntry ratio="1" alpha="0.34902"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      
+      <!-- outer shadow -->
+      <Path y="1.02002" winding="nonZero" data="M1 1.0166 111.941 1.0166C115.277 1.0166 117.991 3.75342 117.991 7.11816L117.991 50.8481C117.991 54.2124 115.277 56.9487 111.941 56.9487L1 56.9487M0 0 0 57.9663 111.941 57.9663C115.834 57.9663 119 54.7729 119 50.8481L119 7.11816C119 3.19238 115.834
+ 0 111.941 0L0 0Z">
+        <fill>
+          <SolidColor color="#000000" alpha="0.2"/>
+        </fill>
+      </Path>
+      
+      <!-- inner shadow -->
+      <Path x="1" y="2.03369" winding="nonZero" data="M110.934 1C113.718 1 115.983 3.28857 115.983 6.10156L115.983 49.8315C115.983 52.644 113.718 54.9321 110.934 54.9321L1 54.9321 1 1 110.934 1ZM110.934 0 0 0 0 55.9321 110.934 55.9321C114.27 55.9321 116.983 53.1958 116.983 49.8315L116.983 6.10156
+C116.983 2.73682 114.27 0 110.934 0L110.934 0Z">
+        <fill>
+          <SolidColor color="#000000" alpha="0.1"/>
+        </fill>
+      </Path>
+      
+      <!-- border -->
+      <Path winding="nonZero" data="M112.066 0 0 0 0 0.983398 112.066 0.983398C115.894 0.983398 119.008 4.07227 119.008 7.86865L119.008 52.1309C119.008 55.9277 115.894 59.0166 112.066 59.0166L0 59.0166 0 60 112.066 60C116.447 60 120 56.4766 120 52.1309L120 7.86865C120 3.52295 116.447
+ 0 112.066 0Z">
+        <fill>
+          <SolidColor color="#464646"/>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarLastButton_selected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarLastButton_selected.fxg
index 8abf203..b435851 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarLastButton_selected.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarLastButton_selected.fxg
@@ -18,32 +18,40 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="4" scaleGridTop="4" scaleGridRight="111" scaleGridBottom="51" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- shadow fill -->
-  <Path data="M0 0 111.934 0C116.388 0 120 3.64258 120 8.13477L120 51.8652C120 56.3574 116.388 60 111.934 60L0 60 0 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="59.9995" y="1.03467" scaleX="58.028" rotation="90">
-        <GradientEntry ratio="0" alpha="0.047059"/>
-        <GradientEntry ratio="1" alpha="0.247059"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- outer shadow -->
-  <Path y="1.01953" winding="nonZero" data="M1.00781 1.01758 111.941 1.01758C115.277 1.01758 117.991 3.75391 117.991 7.11914L117.991 50.8486C117.991 54.2129 115.277 56.9492 111.941 56.9492L1.00781 56.9492 1.00781 1.01758ZM0 57.9668 111.941 57.9668C115.834 57.9668 119 54.7734 119 50.8486&#xD;&#xA;L119 7.11914C119 3.19336 115.834 0 111.941 0L0 0 0 57.9668Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.2"/>
-    </fill>
-  </Path>
-  <!-- inner shadow -->
-  <Path x="0.992188" y="2.0332" winding="nonZero" data="M110.941 1C113.726 1 115.991 3.28857 115.991 6.10156L115.991 49.832C115.991 52.6445 113.726 54.9326 110.941 54.9326L1.00781 54.9326 1 1 110.941 1ZM110.941 0 0 0 0.0078125 55.9326 110.941 55.9326C114.277 55.9326 116.991 53.1963 116.991 49.832L116.991&#xD;&#xA; 6.10156C116.991 2.7373 114.277 0 110.941 0L110.941 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.1"/>
-    </fill>
-  </Path>
-  <!-- border -->
-  <Path winding="nonZero" data="M112.066 0 0 0 0 0.983398 112.066 0.983398C115.894 0.983398 119.008 4.07227 119.008 7.86914L119.008 52.1309C119.008 55.9277 115.894 59.0166 112.066 59.0166L0 59.0166 0 60 112.066 60C116.447 60 120 56.4766 120 52.1309L120 7.86914C120 3.52344 116.447&#xD;&#xA; 0 112.066 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#646464"/>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="4" scaleGridTop="4" scaleGridRight="111" scaleGridBottom="51">
+    
+      <!-- shadow fill -->
+      <Path data="M0 0 111.934 0C116.388 0 120 3.64258 120 8.13477L120 51.8652C120 56.3574 116.388 60 111.934 60L0 60 0 0Z">
+        <fill>
+          <LinearGradient x="59.9995" y="1.03467" scaleX="58.028" rotation="90">
+            <GradientEntry ratio="0" alpha="0.047059"/>
+            <GradientEntry ratio="1" alpha="0.247059"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      
+      <!-- outer shadow -->
+      <Path y="1.01953" winding="nonZero" data="M1.00781 1.01758 111.941 1.01758C115.277 1.01758 117.991 3.75391 117.991 7.11914L117.991 50.8486C117.991 54.2129 115.277 56.9492 111.941 56.9492L1.00781 56.9492 1.00781 1.01758ZM0 57.9668 111.941 57.9668C115.834 57.9668 119 54.7734 119 50.8486
+L119 7.11914C119 3.19336 115.834 0 111.941 0L0 0 0 57.9668Z">
+        <fill>
+          <SolidColor color="#000000" alpha="0.2"/>
+        </fill>
+      </Path>
+      
+      <!-- inner shadow -->
+      <Path x="0.992188" y="2.0332" winding="nonZero" data="M110.941 1C113.726 1 115.991 3.28857 115.991 6.10156L115.991 49.832C115.991 52.6445 113.726 54.9326 110.941 54.9326L1.00781 54.9326 1 1 110.941 1ZM110.941 0 0 0 0.0078125 55.9326 110.941 55.9326C114.277 55.9326 116.991 53.1963 116.991 49.832L116.991
+ 6.10156C116.991 2.7373 114.277 0 110.941 0L110.941 0Z">
+        <fill>
+          <SolidColor color="#000000" alpha="0.1"/>
+        </fill>
+      </Path>
+      
+      <!-- border -->
+      <Path winding="nonZero" data="M112.066 0 0 0 0 0.983398 112.066 0.983398C115.894 0.983398 119.008 4.07227 119.008 7.86914L119.008 52.1309C119.008 55.9277 115.894 59.0166 112.066 59.0166L0 59.0166 0 60 112.066 60C116.447 60 120 56.4766 120 52.1309L120 7.86914C120 3.52344 116.447
+ 0 112.066 0Z">
+        <fill>
+          <SolidColor color="#646464"/>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarLastButton_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarLastButton_up.fxg
index 5aa665f..d97f02d 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarLastButton_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarLastButton_up.fxg
@@ -18,26 +18,31 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="4" scaleGridTop="4" scaleGridRight="111" scaleGridBottom="51" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- highlight fill -->
-  <Path data="M0 0 112.066 0C116.447 0 120 3.52295 120 7.86865L120 52.1309C120 56.4766 116.447 60 112.066 60L0 60 0 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="60" y="0.51709" scaleX="32.2185" rotation="90">
-        <GradientEntry ratio="0" color="#FFFFFF" alpha="0.698039"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.047059"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- left separator highlight -->
-  <Rect y="1" width="1" height="58" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#FFFFFF" alpha="0.2"/>
-    </fill>
-  </Rect>
-  <!-- border -->
-  <Path winding="nonZero" data="M112.066 0 0 0 0 0.983398 112.066 0.983398C115.894 0.983398 119.008 4.07227 119.008 7.86865L119.008 52.1309C119.008 55.9277 115.894 59.0166 112.066 59.0166L0 59.0166 0 60 112.066 60C116.447 60 120 56.4766 120 52.1309L120 7.86865C120 3.52295 116.447&#xD;&#xA; 0 112.066 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#646464"/>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="4" scaleGridTop="4" scaleGridRight="111" scaleGridBottom="51">
+    
+      <!-- highlight fill -->
+      <Path data="M0 0 112.066 0C116.447 0 120 3.52295 120 7.86865L120 52.1309C120 56.4766 116.447 60 112.066 60L0 60 0 0Z">
+        <fill>
+          <LinearGradient x="60" y="0.51709" scaleX="32.2185" rotation="90">
+            <GradientEntry ratio="0" color="#FFFFFF" alpha="0.698039"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.047059"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      
+      <!-- left separator highlight -->
+      <Rect y="1" width="1" height="58">
+        <fill>
+          <SolidColor color="#FFFFFF" alpha="0.2"/>
+        </fill>
+      </Rect>
+      
+      <!-- border -->
+      <Path winding="nonZero" data="M112.066 0 0 0 0 0.983398 112.066 0.983398C115.894 0.983398 119.008 4.07227 119.008 7.86865L119.008 52.1309C119.008 55.9277 115.894 59.0166 112.066 59.0166L0 59.0166 0 60 112.066 60C116.447 60 120 56.4766 120 52.1309L120 7.86865C120 3.52295 116.447
+ 0 112.066 0Z">
+        <fill>
+          <SolidColor color="#646464"/>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarMiddleButton_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarMiddleButton_down.fxg
index 7e2f7fb..8999f79 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarMiddleButton_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarMiddleButton_down.fxg
@@ -18,32 +18,37 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="4" scaleGridTop="4" scaleGridRight="116" scaleGridBottom="56" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- shadow fill -->
-  <Rect width="120" height="60" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="59.9995" y="1.03467" scaleX="58.028" rotation="90">
-        <GradientEntry ratio="0" alpha="0.14902"/>
-        <GradientEntry ratio="1" alpha="0.34902"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- outer shadow -->
-  <Path y="1" winding="nonZero" data="M1 1 118 1 118 57 1 57 1 1ZM0 0.0336914 0 58 119 58 119 0 0 0.0336914Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.2"/>
-    </fill>
-  </Path>
-  <!-- inner shadow -->
-  <Path x="1" y="2" winding="nonZero" data="M116 1 116 55 1 55 1 1 116 1ZM117 0 0 0 0 56 117 56 117 0 117 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.1"/>
-    </fill>
-  </Path>
-  <!-- border -->
-  <Path winding="nonZero" data="M0 0 0 1 119 1 119 59 0 59 0 60 120 60 120 0 0 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#464646"/>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="4" scaleGridTop="4" scaleGridRight="116" scaleGridBottom="56">
+    
+      <!-- shadow fill -->
+      <Rect width="120" height="60">
+        <fill>
+          <LinearGradient x="59.9995" y="1.03467" scaleX="58.028" rotation="90">
+            <GradientEntry ratio="0" alpha="0.14902"/>
+            <GradientEntry ratio="1" alpha="0.34902"/>
+          </LinearGradient>
+        </fill>
+      </Rect>
+      
+      <!-- outer shadow -->
+      <Path y="1" winding="nonZero" data="M1 1 118 1 118 57 1 57 1 1ZM0 0.0336914 0 58 119 58 119 0 0 0.0336914Z">
+        <fill>
+          <SolidColor color="#000000" alpha="0.2"/>
+        </fill>
+      </Path>
+      
+      <!-- inner shadow -->
+      <Path x="1" y="2" winding="nonZero" data="M116 1 116 55 1 55 1 1 116 1ZM117 0 0 0 0 56 117 56 117 0 117 0Z">
+        <fill>
+          <SolidColor color="#000000" alpha="0.1"/>
+        </fill>
+      </Path>
+      
+      <!-- border -->
+      <Path winding="nonZero" data="M0 0 0 1 119 1 119 59 0 59 0 60 120 60 120 0 0 0Z">
+        <fill>
+          <SolidColor color="#464646"/>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarMiddleButton_selected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarMiddleButton_selected.fxg
index 9c84120..3f55cc5 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarMiddleButton_selected.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarMiddleButton_selected.fxg
@@ -18,32 +18,37 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="4" scaleGridTop="4" scaleGridRight="116" scaleGridBottom="56" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- shadow fill -->
-  <Rect y="1" width="119" height="58" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="59.4995" y="1" scaleX="56.0938" rotation="90">
-        <GradientEntry ratio="0" alpha="0.047059"/>
-        <GradientEntry ratio="1" alpha="0.247059"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- outer shadow -->
-  <Path y="1" winding="nonZero" data="M1 1 118 1 118 57 1 57 1 1ZM0 0.0332031 0 58 119 58 119 0 0 0.0332031 0 0.0332031Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.2"/>
-    </fill>
-  </Path>
-  <!-- inner shadow -->
-  <Path x="0.992188" y="2" winding="nonZero" data="M116.008 1 116.008 55 1.00781 55 1 1 116.008 1ZM117.008 0 0 0 0.0078125 56 117.008 56 117.008 0 117.008 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.1"/>
-    </fill>
-  </Path>
-  <!-- border -->
-  <Path winding="nonZero" data="M0 0 0 1 119 1 119 59 0 59 0 60 120 60 120 0 0 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#646464"/>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="4" scaleGridTop="4" scaleGridRight="116" scaleGridBottom="56">
+    
+      <!-- shadow fill -->
+      <Rect y="1" width="119" height="58">
+        <fill>
+          <LinearGradient x="59.4995" y="1" scaleX="56.0938" rotation="90">
+            <GradientEntry ratio="0" alpha="0.047059"/>
+            <GradientEntry ratio="1" alpha="0.247059"/>
+          </LinearGradient>
+        </fill>
+      </Rect>
+      
+      <!-- outer shadow -->
+      <Path y="1" winding="nonZero" data="M1 1 118 1 118 57 1 57 1 1ZM0 0.0332031 0 58 119 58 119 0 0 0.0332031 0 0.0332031Z">
+        <fill>
+          <SolidColor color="#000000" alpha="0.2"/>
+        </fill>
+      </Path>
+      
+      <!-- inner shadow -->
+      <Path x="0.992188" y="2" winding="nonZero" data="M116.008 1 116.008 55 1.00781 55 1 1 116.008 1ZM117.008 0 0 0 0.0078125 56 117.008 56 117.008 0 117.008 0Z">
+        <fill>
+          <SolidColor color="#000000" alpha="0.1"/>
+        </fill>
+      </Path>
+      
+      <!-- border -->
+      <Path winding="nonZero" data="M0 0 0 1 119 1 119 59 0 59 0 60 120 60 120 0 0 0Z">
+        <fill>
+          <SolidColor color="#646464"/>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarMiddleButton_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarMiddleButton_up.fxg
index 2e27c42..3d8bb7f 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarMiddleButton_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ButtonBarMiddleButton_up.fxg
@@ -18,32 +18,37 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="4" scaleGridTop="4" scaleGridRight="116" scaleGridBottom="56" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- highlight fill -->
-  <Rect width="120" height="60" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="60" y="0.51709" scaleX="32.2185" rotation="90">
-        <GradientEntry ratio="0" color="#FFFFFF" alpha="0.698039"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.047059"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- border -->
-  <Path winding="nonZero" data="M0 0 0 1 119 1 119 59 0 59 0 60 120 60 120 0 0 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#646464"/>
-    </fill>
-  </Path>
-  <!-- left separator highlight -->
-  <Rect y="1" width="1" height="58" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#FFFFFF" alpha="0.2"/>
-    </fill>
-  </Rect>
-  <!-- right separator highlight -->
-  <Rect x="118" y="1" width="1" height="58" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#FFFFFF" alpha="0.2"/>
-    </fill>
-  </Rect>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="4" scaleGridTop="4" scaleGridRight="116" scaleGridBottom="56">
+    
+      <!-- highlight fill -->
+      <Rect width="120" height="60">
+        <fill>
+          <LinearGradient x="60" y="0.51709" scaleX="32.2185" rotation="90">
+            <GradientEntry ratio="0" color="#FFFFFF" alpha="0.698039"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.047059"/>
+          </LinearGradient>
+        </fill>
+      </Rect>
+      
+      <!-- border -->
+      <Path winding="nonZero" data="M0 0 0 1 119 1 119 59 0 59 0 60 120 60 120 0 0 0Z">
+        <fill>
+          <SolidColor color="#646464"/>
+        </fill>
+      </Path>
+      
+      <!-- left separator highlight -->
+      <Rect y="1" width="1" height="58">
+        <fill>
+          <SolidColor color="#FFFFFF" alpha="0.2"/>
+        </fill>
+      </Rect>
+      
+      <!-- right separator highlight -->
+      <Rect x="118" y="1" width="1" height="58">
+        <fill>
+          <SolidColor color="#FFFFFF" alpha="0.2"/>
+        </fill>
+      </Rect>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/Button_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/Button_down.fxg
index 6687801..dbadc5c 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/Button_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/Button_down.fxg
@@ -18,32 +18,33 @@
 
 -->
 
-<Graphic version="2.0" viewHeight="65" viewWidth="220" scaleGridLeft="14" scaleGridTop="14" scaleGridRight="206" scaleGridBottom="51" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- Border -->
-  <Path data="M 8 1 C 8 1 212 1 212 1 C 216 1 219 4 219 8 C 219 8 219 57 219 57 C 219 61 216 64 212 64 C 212 64 8 64 8 64 C 4 64 1 61 1 57 C 1 57 1 8 1 8 C 1 4 4 1 8 1 Z M 0 57 C 0 61 4 65 8 65 C 8 65 212 65 212 65 C 216 65 220 61 220 57 C 220 57 220 8 220 8 C 220 4 216 0 212 0 C 212 0 8 0 8 0 C 4 0 0 4 0 8 C 0 8 0 57 0 57 Z " scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#464646"/>
-    </fill>
-  </Path>
-  <!-- Fill Shadow -->
-  <Path data="M 8 1 C 8 1 212 1 212 1 C 216 1 219 4 219 8 C 219 8 219 57 219 57 C 219 61 216 64 212 64 C 212 64 8 64 8 64 C 4 64 1 61 1 57 C 1 57 1 8 1 8 C 1 4 4 1 8 1 Z " scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="110" y="1" scaleX="63" rotation="90">
-        <GradientEntry color="#000000" ratio="0" alpha="0.05"/>
-        <GradientEntry color="#000000" ratio="1" alpha="0.25"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- Inner Shadow -->
-  <Path data="M 8 2 C 8 2 212 2 212 2 C 215 2 218 5 218 8 C 218 8 218 57 218 57 C 218 60 215 63 212 63 C 212 63 8 63 8 63 C 5 63 2 60 2 57 C 2 57 2 8 2 8 C 2 5 5 2 8 2 Z M 8 1 C 4 1 1 4 1 8 C 1 8 1 57 1 57 C 1 61 4 64 8 64 C 8 64 212 64 212 64 C 216 64 219 61 219 57 C 219 57 219 8 219 8 C 219 4 216 1 212 1 C 212 1 8 1 8 1 Z " scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.25"/>
-    </fill>
-  </Path>
-  <!-- Inner Inner Shadow -->
-  <Path data="M 8 3 C 8 3 212 3 212 3 C 215 3 217 5 217 8 C 217 8 217 57 217 57 C 217 60 215 62 212 62 C 212 62 8 62 8 62 C 5 62 3 60 3 57 C 3 57 3 8 3 8 C 3 5 5 3 8 3 Z M 8 2 C 5 2 2 5 2 8 C 2 8 2 57 2 57 C 2 60 5 63 8 63 C 8 63 212 63 212 63 C 215 63 218 60 218 57 C 218 57 218 8 218 8 C 218 5 215 2 212 2 C 212 2 8 2 8 2 Z " scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.1"/>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008" viewHeight= "65" viewWidth= "220"
+	scaleGridLeft="14" scaleGridTop="14" scaleGridRight="206" scaleGridBottom="51">
+	<!-- Border -->
+	<Path data="M 8 1 C 8 1 212 1 212 1 C 216 1 219 4 219 8 C 219 8 219 57 219 57 C 219 61 216 64 212 64 C 212 64 8 64 8 64 C 4 64 1 61 1 57 C 1 57 1 8 1 8 C 1 4 4 1 8 1 Z M 0 57 C 0 61 4 65 8 65 C 8 65 212 65 212 65 C 216 65 220 61 220 57 C 220 57 220 8 220 8 C 220 4 216 0 212 0 C 212 0 8 0 8 0 C 4 0 0 4 0 8 C 0 8 0 57 0 57 Z ">
+		<fill>
+			<SolidColor color="#464646"/>
+		</fill>
+	</Path>
+	<!-- Fill Shadow -->
+	<Path data="M 8 1 C 8 1 212 1 212 1 C 216 1 219 4 219 8 C 219 8 219 57 219 57 C 219 61 216 64 212 64 C 212 64 8 64 8 64 C 4 64 1 61 1 57 C 1 57 1 8 1 8 C 1 4 4 1 8 1 Z ">
+		<fill>
+			<LinearGradient x = "110" y = "1" scaleX = "63" rotation = "90">
+				<GradientEntry color="#000000" ratio="0" alpha="0.05"/>
+				<GradientEntry color="#000000" ratio="1" alpha="0.25"/>
+			</LinearGradient>
+		</fill>
+	</Path>
+	<!-- Inner Shadow -->
+	<Path data="M 8 2 C 8 2 212 2 212 2 C 215 2 218 5 218 8 C 218 8 218 57 218 57 C 218 60 215 63 212 63 C 212 63 8 63 8 63 C 5 63 2 60 2 57 C 2 57 2 8 2 8 C 2 5 5 2 8 2 Z M 8 1 C 4 1 1 4 1 8 C 1 8 1 57 1 57 C 1 61 4 64 8 64 C 8 64 212 64 212 64 C 216 64 219 61 219 57 C 219 57 219 8 219 8 C 219 4 216 1 212 1 C 212 1 8 1 8 1 Z ">
+		<fill>
+			<SolidColor color="#000000" alpha="0.25"/>
+		</fill>
+	</Path>
+	<!-- Inner Inner Shadow -->
+	<Path data="M 8 3 C 8 3 212 3 212 3 C 215 3 217 5 217 8 C 217 8 217 57 217 57 C 217 60 215 62 212 62 C 212 62 8 62 8 62 C 5 62 3 60 3 57 C 3 57 3 8 3 8 C 3 5 5 3 8 3 Z M 8 2 C 5 2 2 5 2 8 C 2 8 2 57 2 57 C 2 60 5 63 8 63 C 8 63 212 63 212 63 C 215 63 218 60 218 57 C 218 57 218 8 218 8 C 218 5 215 2 212 2 C 212 2 8 2 8 2 Z ">
+		<fill>
+			<SolidColor color="#000000" alpha="0.1"/>
+		</fill>
+	</Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/Button_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/Button_up.fxg
index 63dc6c6..9a03665 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/Button_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/Button_up.fxg
@@ -18,11 +18,12 @@
 
 -->
 
-<Graphic version="2.0" viewHeight="65" viewWidth="220" scaleGridLeft="14" scaleGridTop="14" scaleGridRight="206" scaleGridBottom="51" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- Border -->
-  <Path data="M 8 1 C 8 1 212 1 212 1 C 216 1 219 4 219 8 C 219 8 219 57 219 57 C 219 61 216 64 212 64 C 212 64 8 64 8 64 C 4 64 1 61 1 57 C 1 57 1 8 1 8 C 1 4 4 1 8 1 Z M 0 57 C 0 61 4 65 8 65 C 8 65 212 65 212 65 C 216 65 220 61 220 57 C 220 57 220 8 220 8 C 220 4 216 0 212 0 C 212 0 8 0 8 0 C 4 0 0 4 0 8 C 0 8 0 57 0 57 Z " alpha="1" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#646464"/>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008" viewHeight= "65" viewWidth= "220" scaleGridLeft="14" scaleGridTop="14" scaleGridRight="206" scaleGridBottom="51">
+		
+	<!-- Border -->
+	<Path data="M 8 1 C 8 1 212 1 212 1 C 216 1 219 4 219 8 C 219 8 219 57 219 57 C 219 61 216 64 212 64 C 212 64 8 64 8 64 C 4 64 1 61 1 57 C 1 57 1 8 1 8 C 1 4 4 1 8 1 Z M 0 57 C 0 61 4 65 8 65 C 8 65 212 65 212 65 C 216 65 220 61 220 57 C 220 57 220 8 220 8 C 220 4 216 0 212 0 C 212 0 8 0 8 0 C 4 0 0 4 0 8 C 0 8 0 57 0 57 Z " alpha="1">
+		<fill>
+			<SolidColor color="#646464"/>
+		</fill>
+	</Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/CalloutContentBackground.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/CalloutContentBackground.fxg
index b22499b..582649b 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/CalloutContentBackground.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/CalloutContentBackground.fxg
@@ -18,26 +18,34 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="10" scaleGridRight="440" scaleGridTop="22" scaleGridBottom="292" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="299" width="450" height="1" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- Content Shading Top -->
-  <Rect x="0" y="0" width="450" height="15" topLeftRadiusX="7" topLeftRadiusY="7" topRightRadiusX="7" topRightRadiusY="7" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient rotation="90">
-        <GradientEntry ratio="0" color="#000000" alpha="0.6"/>
-        <GradientEntry ratio="0.5" color="#000000" alpha="0"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- Content Highlight -->
-  <Rect x="0.5" y="0.5" width="449" height="299" radiusX="7" radiusY="7" scaleX="0.5" scaleY="0.5">
-    <stroke>
-      <SolidColorStroke color="#FFFFFF" alpha="0.8" weight="1"/>
-    </stroke>
-  </Rect>
-</Graphic>
\ No newline at end of file
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+	scaleGridLeft="10" scaleGridRight="440" scaleGridTop="22" scaleGridBottom="292">
+
+	<!-- invisible fix for scaling -->
+	<Rect x="0" y="299" width="450" height="1">
+		<fill>
+			<SolidColor color="#ffffff" alpha="0"/>
+		</fill>
+	</Rect>
+    
+	<!-- Content Shading Top -->
+	<Rect x="0" y="0" width="450" height="15"
+			topLeftRadiusX="7" topLeftRadiusY="7"
+			topRightRadiusX="7" topRightRadiusY="7">
+		<fill>
+			<LinearGradient  rotation="90">
+				<GradientEntry ratio="0" color="#000000" alpha="0.6"/>
+				<GradientEntry ratio="0.5" color="#000000" alpha="0"/>
+			</LinearGradient>
+		</fill>
+	</Rect>
+	
+	<!-- Content Highlight -->
+	<Rect x="0.5" y="0.5" width="449" height="299"
+			radiusX="7" radiusY="7">
+		<stroke>
+			<SolidColorStroke color="#FFFFFF" alpha="0.8"
+								weight="1"/>
+		</stroke>
+	</Rect>
+</Graphic>
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/CheckBox_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/CheckBox_down.fxg
index 5ea101a..9832741 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/CheckBox_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/CheckBox_down.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,39 +18,40 @@
 
 -->
 
-<Graphic version="2.0" xmlns:fc="http://ns.adobe.com/flashcatalyst/2009" xmlns:d="http://ns.adobe.com/fxg/2008/dt" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path data="M 2 4 C 2 3 3 2 4 2 C 4 2 44 2 44 2 C 45 2 46 3 46 4 C 46 4 46 44 46 44 C 46 45 46 46 45 46 C 45 46 3 46 3 46 C 2 46 2 45 2 44 C 2 44 2 4 2 4 Z M 1 3 C 1 3 1 45 1 45 C 1 46 2 47 3 47 C 3 47 45 47 45 47 C 46 47 47 46 47 45 C 47 45 47 3 47 3 C 47 2 46 1 45 1 C 45 1 3 1 3 1 C 2 1 1 3 1 3 Z " alpha="0.7" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#000000"/>
-    </fill>
-  </Path>
-  <Path data="M 1 3 C 1 2 2 1 3 1 C 3 1 45 1 45 1 C 46 1 47 2 47 3 C 47 3 47 45 47 45 C 47 46 47 47 46 47 C 46 47 2 47 2 47 C 1 47 1 46 1 45 C 1 45 1 3 1 3 Z M 0 2 C 0 2 0 46 0 46 C 0 47 1 48 2 48 C 2 48 46 48 46 48 C 47 48 48 47 48 46 C 48 46 48 2 48 2 C 48 1 47 0 46 0 C 46 0 2 0 2 0 C 1 0 0 2 0 2 Z " alpha="0.06" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#ffffff"/>
-    </fill>
-  </Path>
-  <Path data="M 2 4 C 2 3 3 2 4 2 C 4 2 44 2 44 2 C 45 2 46 3 46 4 C 46 4 46 44 46 44 C 46 45 46 46 45 46 C 45 46 3 46 3 46 C 2 46 2 45 2 44 C 2 44 2 4 2 4 Z " alpha="1" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="24" y="2" scaleX="44" rotation="90">
-        <GradientEntry color="#000000" ratio="0" alpha="0.11"/>
-        <GradientEntry color="#000000" ratio="1" alpha="0.4"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path data="M 3 5 C 3 4 4 3 5 3 C 5 3 43 3 43 3 C 44 3 45 4 45 5 C 45 5 45 43 45 43 C 45 44 45 45 44 45 C 44 45 4 45 4 45 C 3 45 3 44 3 43 C 3 43 3 5 3 5 Z M 2 4 C 2 4 2 44 2 44 C 2 45 2 46 3 46 C 3 46 45 46 45 46 C 46 46 46 45 46 44 C 46 44 46 4 46 4 C 46 3 45 2 44 2 C 44 2 4 2 4 2 C 3 2 2 3 2 4 Z " alpha="1" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="24" y="2" scaleX="44" rotation="90">
-        <GradientEntry color="#000000" ratio="0" alpha="0.25"/>
-        <GradientEntry color="#000000" ratio="1" alpha="0.05"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path data="M 4 6 C 4 5 5 4 6 4 C 6 4 42 4 42 4 C 43 4 44 5 44 6 C 44 6 44 42 44 42 C 44 43 44 44 43 44 C 43 44 5 44 5 44 C 4 44 4 43 4 42 C 4 42 4 6 4 6 Z M 3 5 C 3 5 3 43 3 43 C 3 44 3 45 4 45 C 4 45 44 45 44 45 C 45 45 45 44 45 43 C 45 43 45 5 45 5 C 45 4 44 3 43 3 C 43 3 5 3 5 3 C 4 3 3 4 3 5 Z " alpha="1" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="25" y="3" scaleX="44" rotation="90">
-        <GradientEntry color="#000000" ratio="0" alpha="0.12"/>
-        <GradientEntry color="#000000" ratio="1" alpha="0"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+
+<Graphic xmlns:fc="http://ns.adobe.com/flashcatalyst/2009" xmlns:d="http://ns.adobe.com/fxg/2008/dt" xmlns="http://ns.adobe.com/fxg/2008" version="2.0">
+	<Path data="M 2 4 C 2 3 3 2 4 2 C 4 2 44 2 44 2 C 45 2 46 3 46 4 C 46 4 46 44 46 44 C 46 45 46 46 45 46 C 45 46 3 46 3 46 C 2 46 2 45 2 44 C 2 44 2 4 2 4 Z M 1 3 C 1 3 1 45 1 45 C 1 46 2 47 3 47 C 3 47 45 47 45 47 C 46 47 47 46 47 45 C 47 45 47 3 47 3 C 47 2 46 1 45 1 C 45 1 3 1 3 1 C 2 1 1 3 1 3 Z " alpha="0.7">
+		<fill>
+			<SolidColor color="#000000"/>
+		</fill>
+	</Path>
+	<Path data="M 1 3 C 1 2 2 1 3 1 C 3 1 45 1 45 1 C 46 1 47 2 47 3 C 47 3 47 45 47 45 C 47 46 47 47 46 47 C 46 47 2 47 2 47 C 1 47 1 46 1 45 C 1 45 1 3 1 3 Z M 0 2 C 0 2 0 46 0 46 C 0 47 1 48 2 48 C 2 48 46 48 46 48 C 47 48 48 47 48 46 C 48 46 48 2 48 2 C 48 1 47 0 46 0 C 46 0 2 0 2 0 C 1 0 0 2 0 2 Z " alpha="0.06">
+		<fill>
+			<SolidColor color="#ffffff"/>
+		</fill>
+	</Path>
+	<Path data="M 2 4 C 2 3 3 2 4 2 C 4 2 44 2 44 2 C 45 2 46 3 46 4 C 46 4 46 44 46 44 C 46 45 46 46 45 46 C 45 46 3 46 3 46 C 2 46 2 45 2 44 C 2 44 2 4 2 4 Z " alpha="1">
+		<fill>
+			<LinearGradient x = "24" y = "2" scaleX = "44" rotation = "90">
+				<GradientEntry color="#000000" ratio="0" alpha="0.11"/>
+				<GradientEntry color="#000000" ratio="1" alpha="0.4"/>
+			</LinearGradient>
+		</fill>
+	</Path>
+	<Path data="M 3 5 C 3 4 4 3 5 3 C 5 3 43 3 43 3 C 44 3 45 4 45 5 C 45 5 45 43 45 43 C 45 44 45 45 44 45 C 44 45 4 45 4 45 C 3 45 3 44 3 43 C 3 43 3 5 3 5 Z M 2 4 C 2 4 2 44 2 44 C 2 45 2 46 3 46 C 3 46 45 46 45 46 C 46 46 46 45 46 44 C 46 44 46 4 46 4 C 46 3 45 2 44 2 C 44 2 4 2 4 2 C 3 2 2 3 2 4 Z " alpha="1">
+		<fill>
+			<LinearGradient x = "24" y = "2" scaleX = "44" rotation = "90">
+				<GradientEntry color="#000000" ratio="0" alpha="0.25"/>
+				<GradientEntry color="#000000" ratio="1" alpha="0.05"/>
+			</LinearGradient>
+		</fill>
+	</Path>
+	<Path data="M 4 6 C 4 5 5 4 6 4 C 6 4 42 4 42 4 C 43 4 44 5 44 6 C 44 6 44 42 44 42 C 44 43 44 44 43 44 C 43 44 5 44 5 44 C 4 44 4 43 4 42 C 4 42 4 6 4 6 Z M 3 5 C 3 5 3 43 3 43 C 3 44 3 45 4 45 C 4 45 44 45 44 45 C 45 45 45 44 45 43 C 45 43 45 5 45 5 C 45 4 44 3 43 3 C 43 3 5 3 5 3 C 4 3 3 4 3 5 Z " alpha="1">
+		<fill>
+			<LinearGradient x = "25" y = "3" scaleX = "44" rotation = "90">
+				<GradientEntry color="#000000" ratio="0" alpha="0.12"/>
+				<GradientEntry color="#000000" ratio="1" alpha="0"/>
+			</LinearGradient>
+		</fill>
+	</Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/CheckBox_downSymbol.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/CheckBox_downSymbol.fxg
index 0ef6c4a..77ea039 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/CheckBox_downSymbol.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/CheckBox_downSymbol.fxg
@@ -18,26 +18,28 @@
 
 -->
 
+
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- fill -->
-  <Path data="M 3 25 L 10 18 L 18 26 L 38 6 L 45 13 L 18 40 Z" alpha="1" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="24" y="7" scaleX="22" rotation="90">
-        <GradientEntry color="#999999" ratio="0" alpha="1"/>
-        <GradientEntry color="#b4b4b4" ratio="1" alpha="1"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- checkbox top border -->
-  <Path data="M 3 25 L 10 18 L 18 26 L 38 6 L 45 13" alpha="0.6" scaleX="0.5" scaleY="0.5">
-    <stroke>
-      <SolidColorStroke weight="0" color="#000000" joints="bevel"/>
-    </stroke>
-  </Path>
-  <!-- checkbox bottom border -->
-  <Path data="M 3 25 L 18 40 L 45 13" alpha="0.3" scaleX="0.5" scaleY="0.5">
-    <stroke>
-      <SolidColorStroke weight="0" color="#ffffff" joints="bevel"/>
-    </stroke>
-  </Path>
+	
+	<!-- fill -->
+	<Path data="M 3 25 L 10 18 L 18 26 L 38 6 L 45 13 L 18 40 Z" alpha="1">
+		<fill>
+			<LinearGradient x = "24" y = "7" scaleX = "22" rotation = "90">
+				<GradientEntry color="#999999" ratio="0" alpha="1"/>
+				<GradientEntry color="#b4b4b4" ratio="1" alpha="1"/>
+			</LinearGradient>
+		</fill>
+	</Path>
+	<!-- checkbox top border -->
+	<Path data="M 3 25 L 10 18 L 18 26 L 38 6 L 45 13" alpha="0.6">
+		<stroke>
+			<SolidColorStroke weight="0" color="#000000" joints="bevel"/>
+		</stroke>
+	</Path>
+	<!-- checkbox bottom border -->
+	<Path data="M 3 25 L 18 40 L 45 13" alpha="0.3">
+		<stroke>
+			<SolidColorStroke weight="0" color="#ffffff" joints="bevel"/>
+		</stroke>
+	</Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/CheckBox_downSymbolSelected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/CheckBox_downSymbolSelected.fxg
index 1a2dc16..926c4ab 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/CheckBox_downSymbolSelected.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/CheckBox_downSymbolSelected.fxg
@@ -18,26 +18,28 @@
 
 -->
 
+
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- fill -->
-  <Path data="M 3 25 L 10 18 L 18 26 L 38 6 L 45 13 L 18 40 Z" alpha="1" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="20" y="17" scaleX="24" rotation="90">
-        <GradientEntry color="#5a5a5a" ratio="0" alpha="1"/>
-        <GradientEntry color="#323232" ratio="1" alpha="1"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- checkbox top border -->
-  <Path data="M 3 25 L 10 18 L 18 26 L 38 6 L 45 13" alpha="0.25" scaleX="0.5" scaleY="0.5">
-    <stroke>
-      <SolidColorStroke weight="0" color="#ffffff" joints="bevel"/>
-    </stroke>
-  </Path>
-  <!-- checkbox bottom border -->
-  <Path data="M 3 25 L 18 40 L 45 13" alpha="0.7" scaleX="0.5" scaleY="0.5">
-    <stroke>
-      <SolidColorStroke weight="0" color="#000000" joints="bevel"/>
-    </stroke>
-  </Path>
+	
+	<!-- fill -->
+	<Path data="M 3 25 L 10 18 L 18 26 L 38 6 L 45 13 L 18 40 Z" alpha="1">
+		<fill>
+			<LinearGradient x = "20" y = "17" scaleX = "24" rotation = "90">
+				<GradientEntry color="#5a5a5a" ratio="0" alpha="1"/>
+				<GradientEntry color="#323232" ratio="1" alpha="1"/>
+			</LinearGradient>
+		</fill>
+	</Path>
+	<!-- checkbox top border -->
+	<Path data="M 3 25 L 10 18 L 18 26 L 38 6 L 45 13" alpha="0.25">
+		<stroke>
+			<SolidColorStroke weight="0" color="#ffffff" joints="bevel"/>
+		</stroke>
+	</Path>
+	<!-- checkbox bottom border -->
+	<Path data="M 3 25 L 18 40 L 45 13" alpha="0.7">
+		<stroke>
+			<SolidColorStroke weight="0" color="#000000" joints="bevel"/>
+		</stroke>
+	</Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/CheckBox_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/CheckBox_up.fxg
index 47a0f7a..ff6ddaa 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/CheckBox_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/CheckBox_up.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,41 +18,42 @@
 
 -->
 
-<Graphic version="2.0" xmlns:fc="http://ns.adobe.com/flashcatalyst/2009" xmlns:d="http://ns.adobe.com/fxg/2008/dt" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path data="M 2 4 C 2 3 3 2 4 2 C 4 2 44 2 44 2 C 45 2 46 3 46 4 C 46 4 46 44 46 44 C 46 45 46 46 45 46 C 45 46 3 46 3 46 C 2 46 2 45 2 44 C 2 44 2 4 2 4 Z " alpha="1" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="24" y="9" scaleX="31" rotation="90">
-        <GradientEntry color="#ffffff" ratio="0" alpha="0.8"/>
-        <GradientEntry color="#ffffff" ratio="1" alpha="0.05"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path data="M 3 5 C 3 4 4 3 5 3 C 5 3 43 3 43 3 C 44 3 45 4 45 5 C 45 5 45 43 45 43 C 45 44 45 45 44 45 C 44 45 4 45 4 45 C 3 45 3 44 3 43 C 3 43 3 5 3 5 Z M 2 4 C 2 4 2 44 2 44 C 2 45 2 46 3 46 C 3 46 45 46 45 46 C 46 46 46 45 46 44 C 46 44 46 4 46 4 C 46 3 45 2 44 2 C 44 2 4 2 4 2 C 3 2 2 3 2 4 Z " alpha="1" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="24" y="2" scaleX="44" rotation="90">
-        <GradientEntry color="#ffffff" ratio="0" alpha="0.35"/>
-        <GradientEntry color="#000000" ratio="1" alpha="0"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path data="M 2 4 C 2 3 3 2 4 2 C 4 2 44 2 44 2 C 45 2 46 3 46 4 C 46 4 46 44 46 44 C 46 45 46 46 45 46 C 45 46 3 46 3 46 C 2 46 2 45 2 44 C 2 44 2 4 2 4 Z M 1 3 C 1 3 1 45 1 45 C 1 46 2 47 3 47 C 3 47 45 47 45 47 C 46 47 47 46 47 45 C 47 45 47 3 47 3 C 47 2 46 1 45 1 C 45 1 3 1 3 1 C 2 1 1 3 1 3 Z " alpha="0.6" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#000000"/>
-    </fill>
-  </Path>
-  <Path data="M 1 3 C 1 2 2 1 3 1 C 3 1 45 1 45 1 C 46 1 47 2 47 3 C 47 3 47 45 47 45 C 47 46 47 47 46 47 C 46 47 2 47 2 47 C 1 47 1 46 1 45 C 1 45 1 3 1 3 Z M 0 2 C 0 2 0 46 0 46 C 0 47 1 48 2 48 C 2 48 46 48 46 48 C 47 48 48 47 48 46 C 48 46 48 2 48 2 C 48 1 47 0 46 0 C 46 0 2 0 2 0 C 1 0 0 2 0 2 Z " alpha="0.06" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#000000"/>
-    </fill>
-  </Path>
-  <Rect x="3" y="2" width="42" height="1" alpha="0.15" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#ffffff"/>
-    </fill>
-  </Rect>
-  <Rect x="2" y="47" width="44" height="1" alpha="0.1" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#000000"/>
-    </fill>
-  </Rect>
+
+<Graphic xmlns:fc="http://ns.adobe.com/flashcatalyst/2009" xmlns:d="http://ns.adobe.com/fxg/2008/dt" xmlns="http://ns.adobe.com/fxg/2008" version="2.0">
+	<Path data="M 2 4 C 2 3 3 2 4 2 C 4 2 44 2 44 2 C 45 2 46 3 46 4 C 46 4 46 44 46 44 C 46 45 46 46 45 46 C 45 46 3 46 3 46 C 2 46 2 45 2 44 C 2 44 2 4 2 4 Z " alpha="1">
+		<fill>
+			<LinearGradient x = "24" y = "9" scaleX = "31" rotation = "90">
+				<GradientEntry color="#ffffff" ratio="0" alpha="0.8"/>
+				<GradientEntry color="#ffffff" ratio="1" alpha="0.05"/>
+			</LinearGradient>
+		</fill>
+	</Path>
+	<Path data="M 3 5 C 3 4 4 3 5 3 C 5 3 43 3 43 3 C 44 3 45 4 45 5 C 45 5 45 43 45 43 C 45 44 45 45 44 45 C 44 45 4 45 4 45 C 3 45 3 44 3 43 C 3 43 3 5 3 5 Z M 2 4 C 2 4 2 44 2 44 C 2 45 2 46 3 46 C 3 46 45 46 45 46 C 46 46 46 45 46 44 C 46 44 46 4 46 4 C 46 3 45 2 44 2 C 44 2 4 2 4 2 C 3 2 2 3 2 4 Z " alpha="1">
+		<fill>
+			<LinearGradient x = "24" y = "2" scaleX = "44" rotation = "90">
+				<GradientEntry color="#ffffff" ratio="0" alpha="0.35"/>
+				<GradientEntry color="#000000" ratio="1" alpha="0"/>
+			</LinearGradient>
+		</fill>
+	</Path>
+	<Path data="M 2 4 C 2 3 3 2 4 2 C 4 2 44 2 44 2 C 45 2 46 3 46 4 C 46 4 46 44 46 44 C 46 45 46 46 45 46 C 45 46 3 46 3 46 C 2 46 2 45 2 44 C 2 44 2 4 2 4 Z M 1 3 C 1 3 1 45 1 45 C 1 46 2 47 3 47 C 3 47 45 47 45 47 C 46 47 47 46 47 45 C 47 45 47 3 47 3 C 47 2 46 1 45 1 C 45 1 3 1 3 1 C 2 1 1 3 1 3 Z " alpha="0.6">
+		<fill>
+			<SolidColor color="#000000"/>
+		</fill>
+	</Path>
+	<Path data="M 1 3 C 1 2 2 1 3 1 C 3 1 45 1 45 1 C 46 1 47 2 47 3 C 47 3 47 45 47 45 C 47 46 47 47 46 47 C 46 47 2 47 2 47 C 1 47 1 46 1 45 C 1 45 1 3 1 3 Z M 0 2 C 0 2 0 46 0 46 C 0 47 1 48 2 48 C 2 48 46 48 46 48 C 47 48 48 47 48 46 C 48 46 48 2 48 2 C 48 1 47 0 46 0 C 46 0 2 0 2 0 C 1 0 0 2 0 2 Z " alpha="0.06">
+		<fill>
+			<SolidColor color="#000000"/>
+		</fill>
+	</Path>
+	<Rect x="3" y="2" width="42" height="1" alpha="0.15">
+		<fill>
+			<SolidColor color="#ffffff"/>
+		</fill>
+	</Rect>
+	<Rect x="2" y="47" width="44" height="1" alpha="0.1">
+		<fill>
+			<SolidColor color="#000000"/>
+		</fill>
+	</Rect>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/CheckBox_upSymbol.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/CheckBox_upSymbol.fxg
index 07ef0ac..082d0d6 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/CheckBox_upSymbol.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/CheckBox_upSymbol.fxg
@@ -18,26 +18,28 @@
 
 -->
 
+
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- fill -->
-  <Path data="M 3 25 L 10 18 L 18 26 L 38 6 L 45 13 L 18 40 Z" alpha="1" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="20" y="17" scaleX="24" rotation="90">
-        <GradientEntry color="#c8c8c8" ratio="0" alpha="1"/>
-        <GradientEntry color="#e1e1e1" ratio="1" alpha="1"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- checkbox top border -->
-  <Path data="M 3 25 L 10 18 L 18 26 L 38 6 L 45 13" alpha="0.5" scaleX="0.5" scaleY="0.5">
-    <stroke>
-      <SolidColorStroke weight="0" color="#000000" joints="bevel"/>
-    </stroke>
-  </Path>
-  <!-- checkbox bottom border -->
-  <Path data="M 3 25 L 18 40 L 45 13" alpha="0.5" scaleX="0.5" scaleY="0.5">
-    <stroke>
-      <SolidColorStroke weight="0" color="#ffffff" joints="bevel"/>
-    </stroke>
-  </Path>
+	
+	<!-- fill -->
+	<Path data="M 3 25 L 10 18 L 18 26 L 38 6 L 45 13 L 18 40 Z" alpha="1">
+		<fill>
+			<LinearGradient x = "20" y = "17" scaleX = "24" rotation = "90">
+				<GradientEntry color="#c8c8c8" ratio="0" alpha="1"/>
+				<GradientEntry color="#e1e1e1" ratio="1" alpha="1"/>
+			</LinearGradient>
+		</fill>
+	</Path>
+	<!-- checkbox top border -->
+	<Path data="M 3 25 L 10 18 L 18 26 L 38 6 L 45 13" alpha="0.5">
+		<stroke>
+			<SolidColorStroke weight="0" color="#000000" joints="bevel"/>
+		</stroke>
+	</Path>
+	<!-- checkbox bottom border -->
+	<Path data="M 3 25 L 18 40 L 45 13" alpha="0.5">
+		<stroke>
+			<SolidColorStroke weight="0" color="#ffffff" joints="bevel"/>
+		</stroke>
+	</Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/CheckBox_upSymbolSelected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/CheckBox_upSymbolSelected.fxg
index a026bc2..501e785 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/CheckBox_upSymbolSelected.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/CheckBox_upSymbolSelected.fxg
@@ -18,26 +18,27 @@
 
 -->
 
+
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- fill -->
-  <Path data="M 3 25 L 10 18 L 18 26 L 38 6 L 45 13 L 18 40 Z" alpha="1" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="20" y="16" scaleX="24" rotation="90">
-        <GradientEntry color="#5a5a5a" ratio="0" alpha="1"/>
-        <GradientEntry color="#323232" ratio="1" alpha="1"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- checkbox top border -->
-  <Path data="M 3 25 L 10 18 L 18 26 L 38 6 L 45 13" alpha="0.7" scaleX="0.5" scaleY="0.5">
-    <stroke>
-      <SolidColorStroke weight="0" color="#ffffff" joints="bevel"/>
-    </stroke>
-  </Path>
-  <!-- checkbox bottom border -->
-  <Path data="M 3 25 L 18 40 L 45 13" alpha="1" scaleX="0.5" scaleY="0.5">
-    <stroke>
-      <SolidColorStroke weight="0" color="#000000" joints="bevel"/>
-    </stroke>
-  </Path>
+	<!-- fill -->
+	<Path data="M 3 25 L 10 18 L 18 26 L 38 6 L 45 13 L 18 40 Z" alpha="1">
+		<fill>
+			<LinearGradient x = "20" y = "16" scaleX = "24" rotation = "90">
+				<GradientEntry color="#5a5a5a" ratio="0" alpha="1"/>
+				<GradientEntry color="#323232" ratio="1" alpha="1"/>
+			</LinearGradient>
+		</fill>
+	</Path>
+	<!-- checkbox top border -->
+	<Path data="M 3 25 L 10 18 L 18 26 L 38 6 L 45 13" alpha="0.7">
+		<stroke>
+			<SolidColorStroke weight="0" color="#ffffff" joints="bevel"/>
+		</stroke>
+	</Path>
+	<!-- checkbox bottom border -->
+	<Path data="M 3 25 L 18 40 L 45 13" alpha="1">
+		<stroke>
+			<SolidColorStroke weight="0" color="#000000" joints="bevel"/>
+		</stroke>
+	</Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/HSliderThumb_normal.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/HSliderThumb_normal.fxg
index bbdb0a5..0963286 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/HSliderThumb_normal.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/HSliderThumb_normal.fxg
@@ -18,26 +18,27 @@
 
 -->
 
-<Graphic version="2.0" viewHeight="44" viewWidth="44" xmlns="http://ns.adobe.com/fxg/2008" xmlns:d="http://ns.adobe.com/fxg/2008/dt" xmlns:fc="http://ns.adobe.com/flashcatalyst/2009">
-  <Ellipse width="44" height="44" x="0" y="0" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="22" y="0" scaleX="44" rotation="90">
-        <GradientEntry color="#000000" ratio="0" alpha="0.15"/>
-        <GradientEntry color="#000000" ratio="1" alpha="0.25"/>
-      </LinearGradient>
-    </fill>
-  </Ellipse>
-  <Ellipse width="42" height="42" x="1" y="1" scaleX="0.5" scaleY="0.5">
-    <stroke>
-      <SolidColorStroke color="#000000" weight="1" alpha="0.7" caps="none"/>
-    </stroke>
-  </Ellipse>
-  <Ellipse width="40" height="40" x="2" y="2" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="23" y="10" scaleX="19" rotation="90">
-        <GradientEntry color="#ffffff" ratio="0" alpha="0.5"/>
-        <GradientEntry color="#ffffff" ratio="1" alpha="0.1"/>
-      </LinearGradient>
-    </fill>
-  </Ellipse>
+
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008" xmlns:d="http://ns.adobe.com/fxg/2008/dt" xmlns:fc="http://ns.adobe.com/flashcatalyst/2009"  viewHeight= "44" viewWidth= "44">
+		<Ellipse width="44" height="44" x="0" y="0">
+			<fill>
+				<LinearGradient x = "22" y = "0" scaleX = "44" rotation = "90">
+					<GradientEntry color="#000000" ratio="0" alpha="0.15"/>
+					<GradientEntry color="#000000" ratio="1" alpha="0.25"/>
+				</LinearGradient>
+			</fill>
+		</Ellipse>
+		<Ellipse width="42" height="42" x="1" y="1">
+			<stroke>
+				<SolidColorStroke color="#000000" weight="1"  alpha="0.7" caps="none"/>
+			</stroke>
+		</Ellipse>
+		<Ellipse width="40" height="40" x="2" y="2">
+			<fill>
+				<LinearGradient x = "23" y = "10" scaleX = "19" rotation = "90">
+					<GradientEntry color="#ffffff" ratio="0" alpha="0.5"/>
+					<GradientEntry color="#ffffff" ratio="1" alpha="0.1"/>
+				</LinearGradient>
+			</fill>
+		</Ellipse>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/HSliderThumb_pressed.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/HSliderThumb_pressed.fxg
index 85031e0..0e63fb5 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/HSliderThumb_pressed.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/HSliderThumb_pressed.fxg
@@ -18,38 +18,39 @@
 
 -->
 
-<Graphic version="2.0" viewHeight="44" viewWidth="44" xmlns="http://ns.adobe.com/fxg/2008" xmlns:d="http://ns.adobe.com/fxg/2008/dt" xmlns:fc="http://ns.adobe.com/flashcatalyst/2009">
-  <!-- outer ellipse -->
-  <Ellipse width="44" height="44" x="0" y="0" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="22" y="0" scaleX="44" rotation="90">
-        <GradientEntry color="#000000" ratio="0" alpha="0.05"/>
-        <GradientEntry color="#000000" ratio="1" alpha="0.15"/>
-      </LinearGradient>
-    </fill>
-  </Ellipse>
-  <!-- outer border -->
-  <Ellipse width="42" height="42" x="1" y="1" scaleX="0.5" scaleY="0.5">
-    <stroke>
-      <SolidColorStroke color="#000000" weight="1" alpha="0.7" caps="none"/>
-    </stroke>
-  </Ellipse>
-  <!-- inner ellipse -->
-  <Ellipse width="42" height="42" x="1" y="1" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="22" y="2" scaleX="40" rotation="90">
-        <GradientEntry color="#000000" ratio="0" alpha="0.25"/>
-        <GradientEntry color="#000000" ratio="1" alpha="0.6"/>
-      </LinearGradient>
-    </fill>
-  </Ellipse>
-  <!-- inner border -->
-  <Path data="M 3 22 C 3 12 12 3 22 3 C 32 3 41 12 41 22 C 41 32 32 41 22 41 C 12 41 3 32 3 22 Z M 2 22 C 2 33 11 42 22 42 C 33 42 42 33 42 22 C 42 11 33 2 22 2 C 11 2 2 11 2 22 Z " scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="22" y="2" scaleX="40" rotation="90">
-        <GradientEntry color="#000000" ratio="0" alpha="0.25"/>
-        <GradientEntry color="#000000" ratio="1" alpha="0.1"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008" xmlns:d="http://ns.adobe.com/fxg/2008/dt" xmlns:fc="http://ns.adobe.com/flashcatalyst/2009"  viewHeight= "44" viewWidth= "44">
+	<!-- outer ellipse -->
+	<Ellipse width="44" height="44" x="0" y="0">
+		<fill>
+			<LinearGradient x = "22" y = "0" scaleX = "44" rotation = "90">
+				<GradientEntry color="#000000" ratio="0" alpha="0.05"/>
+				<GradientEntry color="#000000" ratio="1" alpha="0.15"/>
+			</LinearGradient>
+		</fill>
+	</Ellipse>
+	<!-- outer border -->
+	<Ellipse width="42" height="42" x="1" y="1">
+		<stroke>
+			<SolidColorStroke color="#000000" weight="1" alpha="0.7" caps="none"/>
+		</stroke>
+	</Ellipse>
+	<!-- inner ellipse -->
+	<Ellipse width="42" height="42" x="1" y="1">
+		<fill>
+			<LinearGradient x = "22" y = "2" scaleX = "40" rotation = "90">
+				<GradientEntry color="#000000" ratio="0" alpha="0.25"/>
+				<GradientEntry color="#000000" ratio="1" alpha="0.6"/>
+			</LinearGradient>
+		</fill>
+	</Ellipse>
+	<!-- inner border -->
+	<Path data="M 3 22 C 3 12 12 3 22 3 C 32 3 41 12 41 22 C 41 32 32 41 22 41 C 12 41 3 32 3 22 Z M 2 22 C 2 33 11 42 22 42 C 33 42 42 33 42 22 C 42 11 33 2 22 2 C 11 2 2 11 2 22 Z ">
+		<fill>
+			<LinearGradient x = "22" y = "2" scaleX = "40" rotation = "90">
+				<GradientEntry color="#000000" ratio="0" alpha="0.25"/>
+				<GradientEntry color="#000000" ratio="1" alpha="0.1"/>
+			</LinearGradient>
+		</fill>
+	</Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/HSliderTrack.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/HSliderTrack.fxg
index 42191dc..dbb044d 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/HSliderTrack.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/HSliderTrack.fxg
@@ -18,34 +18,36 @@
 
 -->
 
-<Graphic version="2.0" viewHeight="13" viewWidth="768" scaleGridLeft="23" scaleGridRight="745" scaleGridTop="1" scaleGridBottom="12" xmlns="http://ns.adobe.com/fxg/2008">
-  <Rect x="16" width="736" height="12" radiusX="5.43198" radiusY="5.43198" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="368" y="0" scaleX="12.0005" rotation="90">
-        <GradientEntry ratio="0" alpha="0.5"/>
-        <GradientEntry ratio="1" alpha="0.2"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <Path x="16" y="7" data="M0 0C0 3 3 6 6 6L730 6C733 6 736 3 736 0 735 1 733 5 730 5L6 5C3 5 0 2 0 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="368" y="0" scaleX="5" rotation="90">
-        <GradientEntry ratio="0" color="#FFFFFF" alpha="0.1"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.5"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path x="16" data="M0 6C1 4 3 1 6 1L730 1C733 1 735 4 736 6 736 3 733 0 730 0L6 0C3 0 0 3 0 6Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="368" y="0" scaleX="6" rotation="90">
-        <GradientEntry ratio="0" alpha="0.4"/>
-        <GradientEntry ratio="1" alpha="0.05"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Rect width="768" height="13" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor alpha="0"/>
-    </fill>
-  </Rect>
+
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008" viewHeight= "13" viewWidth= "768"
+         scaleGridLeft="23" scaleGridRight="745" scaleGridTop="1" scaleGridBottom="12">
+      <Rect x="16" width="736" height="12" radiusX="5.43198" radiusY="5.43198">
+        <fill>
+          <LinearGradient x="368" y="0" scaleX="12.0005" rotation="90">
+            <GradientEntry ratio="0" alpha="0.5"/>
+            <GradientEntry ratio="1" alpha="0.2"/>
+          </LinearGradient>
+        </fill>
+      </Rect>
+      <Path x="16" y="7" data="M0 0C0 3 3 6 6 6L730 6C733 6 736 3 736 0 735 1 733 5 730 5L6 5C3 5 0 2 0 0Z">
+        <fill>
+          <LinearGradient x="368" y="0" scaleX="5" rotation="90">
+            <GradientEntry ratio="0" color="#FFFFFF" alpha="0.1"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.5"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      <Path x="16" data="M0 6C1 4 3 1 6 1L730 1C733 1 735 4 736 6 736 3 733 0 730 0L6 0C3 0 0 3 0 6Z">
+        <fill>
+          <LinearGradient x="368" y="0" scaleX="6" rotation="90">
+            <GradientEntry ratio="0" alpha="0.4"/>
+            <GradientEntry ratio="1" alpha="0.05"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      <Rect width="768" height="13">
+        <fill>
+          <SolidColor alpha="0"/>
+        </fill>
+      </Rect>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ImageInvalid.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ImageInvalid.fxg
index 2ada449..19b0550 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ImageInvalid.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ImageInvalid.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,25 +18,29 @@
 
 -->
 
+
 <Graphic version="2.0" viewHeight="50" viewWidth="50" xmlns="http://ns.adobe.com/fxg/2008">
-  <Rect x="0.5" y="0.5" width="49" height="49" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#FFFFFF"/>
-    </fill>
-  </Rect>
-  <Path winding="nonZero" data="M49 1 49 49 1 49 1 1 49 1M50 0 0 0 0 50 50 50 50 0 50 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#FFFFFF"/>
-    </fill>
-  </Path>
-  <Path winding="nonZero" data="M0 0 0 50 50 50 50 0 0 0ZM47 47 3 47 3 3 47 3 47 47Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#969696"/>
-    </fill>
-  </Path>
-  <Path x="6" y="6" winding="nonZero" data="M0 0 0 38 38 38 38 0 0 0ZM19.2524 35.5098C17.3325 35.5098 15.8921 34.2617 15.8921 32.1484 15.8921 30.1328 17.3325 28.8379 19.2524 28.8379 21.2676 28.8379 22.6133 30.2285 22.6133 32.1484 22.6133 34.166 21.3652 35.5098 19.2524 35.5098ZM21.0293 22.0684&#xD;&#xA;C21.0293 22.9316 21.3652 23.7031 21.8926 24.6152 21.9883 24.8066 21.8926 25 21.6523 25L17.4282 25C17.188 25 17.0923 24.998 16.8521 24.7578 15.9878 23.7988 15.604 22.4541 15.604 21.4932 15.604 17.6533 21.8926 15.3008 21.8926 11.46 21.8926 9.58789&#xD;&#xA; 20.3555 7.95557 17.4282 7.95557 15.0278 7.95557 13.1572 8.43555 11.4775 9.15625 11.2861 9.25195 11 9.15576 11 8.96338L11 5.17139C11 4.979 11.1416 4.78711 11.333 4.69092 12.5342 4.11523 15.0029 3.20312 18.5557 3.20312 24.1719 3.20312 27.8086 6.41943&#xD;&#xA; 27.8086 11.0278 27.8086 16.3081 21.0293 19.3325 21.0293 22.0684Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#969696"/>
-    </fill>
-  </Path>
+        <Rect x="0.5" y="0.5" width="49" height="49">
+          <fill>
+            <SolidColor color="#FFFFFF"/>
+          </fill>
+        </Rect>
+        <Path winding="nonZero" data="M49 1 49 49 1 49 1 1 49 1M50 0 0 0 0 50 50 50 50 0 50 0Z">
+          <fill>
+            <SolidColor color="#FFFFFF"/>
+          </fill>
+        </Path>
+      <Path winding="nonZero" data="M0 0 0 50 50 50 50 0 0 0ZM47 47 3 47 3 3 47 3 47 47Z">
+        <fill>
+          <SolidColor color="#969696"/>
+        </fill>
+      </Path>
+      <Path x="6" y="6" winding="nonZero" data="M0 0 0 38 38 38 38 0 0 0ZM19.2524 35.5098C17.3325 35.5098 15.8921 34.2617 15.8921 32.1484 15.8921 30.1328 17.3325 28.8379 19.2524 28.8379 21.2676 28.8379 22.6133 30.2285 22.6133 32.1484 22.6133 34.166 21.3652 35.5098 19.2524 35.5098ZM21.0293 22.0684
+C21.0293 22.9316 21.3652 23.7031 21.8926 24.6152 21.9883 24.8066 21.8926 25 21.6523 25L17.4282 25C17.188 25 17.0923 24.998 16.8521 24.7578 15.9878 23.7988 15.604 22.4541 15.604 21.4932 15.604 17.6533 21.8926 15.3008 21.8926 11.46 21.8926 9.58789
+ 20.3555 7.95557 17.4282 7.95557 15.0278 7.95557 13.1572 8.43555 11.4775 9.15625 11.2861 9.25195 11 9.15576 11 8.96338L11 5.17139C11 4.979 11.1416 4.78711 11.333 4.69092 12.5342 4.11523 15.0029 3.20312 18.5557 3.20312 24.1719 3.20312 27.8086 6.41943
+ 27.8086 11.0278 27.8086 16.3081 21.0293 19.3325 21.0293 22.0684Z">
+        <fill>
+          <SolidColor color="#969696"/>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/RadioButton_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/RadioButton_down.fxg
index ec35545..b4b2b8b 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/RadioButton_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/RadioButton_down.fxg
@@ -18,36 +18,37 @@
 
 -->
 
+
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008" xmlns:d="http://ns.adobe.com/fxg/2008/dt" xmlns:fc="http://ns.adobe.com/flashcatalyst/2009">
-  <Path data="M 2 24 C 2 11 12 1 25 1 C 38 1 48 11 48 24 C 48 37 38 47 25 47 C 12 47 2 37 2 24 Z M 1 24 C 1 37 12 48 25 48 C 38 48 49 37 49 24 C 49 11 38 0 25 0 C 12 0 1 11 1 24 Z " blendMode="normal" alpha="1" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="25" y="0" scaleX="48" rotation="90">
-        <GradientEntry color="#ffffff" ratio="0" alpha="0.047058823529411764"/>
-        <GradientEntry color="#ffffff" ratio="1" alpha="0.2"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path data="M 3 24 C 3 11 12 2 25 2 C 38 2 47 11 47 24 C 47 37 38 46 25 46 C 12 46 3 37 3 24 Z " blendMode="normal" alpha="1" d:userLabel="Ellipse" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="25" y="2" scaleX="44" rotation="90">
-        <GradientEntry color="#000000" ratio="0" alpha="0.10980392156862745"/>
-        <GradientEntry color="#000000" ratio="1" alpha="0.4"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path data="M 3 24 C 3 11 12 2 25 2 C 38 2 47 11 47 24 C 47 37 38 46 25 46 C 12 46 3 37 3 24 Z M 2 24 C 2 37 12 47 25 47 C 38 47 48 37 48 24 C 48 11 38 1 25 1 C 12 1 2 11 2 24 Z " blendMode="normal" alpha="0.6509803921568627" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#000000"/>
-    </fill>
-  </Path>
-  <Path data="M 4 24 C 4 12 13 3 25 3 C 37 3 46 12 46 24 C 46 36 37 45 25 45 C 13 45 4 36 4 24 Z M 3 24 C 3 37 12 46 25 46 C 38 46 47 37 47 24 C 47 11 38 2 25 2 C 12 2 3 11 3 24 Z " blendMode="normal" alpha="0.25098039215686274" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#1e1e1e"/>
-    </fill>
-  </Path>
-  <Path data="M 5 24 C 5 12 13 4 25 4 C 37 4 45 12 45 24 C 45 36 37 44 25 44 C 13 44 5 36 5 24 Z M 4 24 C 4 36 13 45 25 45 C 37 45 46 36 46 24 C 46 12 37 3 25 3 C 13 3 4 12 4 24 Z " blendMode="normal" alpha="0.10196078431372549" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#1e1e1e"/>
-    </fill>
-  </Path>
+	<Path data="M 2 24 C 2 11 12 1 25 1 C 38 1 48 11 48 24 C 48 37 38 47 25 47 C 12 47 2 37 2 24 Z M 1 24 C 1 37 12 48 25 48 C 38 48 49 37 49 24 C 49 11 38 0 25 0 C 12 0 1 11 1 24 Z " blendMode="normal" alpha="1">
+			<fill>
+				<LinearGradient x = "25" y = "0" scaleX = "48" rotation = "90">
+					<GradientEntry color="#ffffff" ratio="0" alpha="0.047058823529411764"/>
+					<GradientEntry color="#ffffff" ratio="1" alpha="0.2"/>
+				</LinearGradient>
+			</fill>
+		</Path>
+		<Path data="M 3 24 C 3 11 12 2 25 2 C 38 2 47 11 47 24 C 47 37 38 46 25 46 C 12 46 3 37 3 24 Z " blendMode="normal" alpha="1" d:userLabel="Ellipse">
+			<fill>
+				<LinearGradient x = "25" y = "2" scaleX = "44" rotation = "90">
+					<GradientEntry color="#000000" ratio="0" alpha="0.10980392156862745"/>
+					<GradientEntry color="#000000" ratio="1" alpha="0.4"/>
+				</LinearGradient>
+			</fill>
+		</Path>
+		<Path data="M 3 24 C 3 11 12 2 25 2 C 38 2 47 11 47 24 C 47 37 38 46 25 46 C 12 46 3 37 3 24 Z M 2 24 C 2 37 12 47 25 47 C 38 47 48 37 48 24 C 48 11 38 1 25 1 C 12 1 2 11 2 24 Z " blendMode="normal" alpha="0.6509803921568627">
+			<fill>
+				<SolidColor color="#000000"/>
+			</fill>
+		</Path>
+		<Path data="M 4 24 C 4 12 13 3 25 3 C 37 3 46 12 46 24 C 46 36 37 45 25 45 C 13 45 4 36 4 24 Z M 3 24 C 3 37 12 46 25 46 C 38 46 47 37 47 24 C 47 11 38 2 25 2 C 12 2 3 11 3 24 Z " blendMode="normal" alpha="0.25098039215686274">
+			<fill>
+				<SolidColor color="#1e1e1e"/>
+			</fill>
+		</Path>
+		<Path data="M 5 24 C 5 12 13 4 25 4 C 37 4 45 12 45 24 C 45 36 37 44 25 44 C 13 44 5 36 5 24 Z M 4 24 C 4 36 13 45 25 45 C 37 45 46 36 46 24 C 46 12 37 3 25 3 C 13 3 4 12 4 24 Z " blendMode="normal" alpha="0.10196078431372549">
+			<fill>
+				<SolidColor color="#1e1e1e"/>
+			</fill>
+		</Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/RadioButton_downSymbol.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/RadioButton_downSymbol.fxg
index 41bc177..ae586d5 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/RadioButton_downSymbol.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/RadioButton_downSymbol.fxg
@@ -17,19 +17,18 @@
   limitations under the License.
 
 -->
-
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path data="M 13 24 C 13 18 19 12 25 12 C 31 12 37 18 37 24 C 37 30 31 36 25 36 C 19 36 13 30 13 24 Z " scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#646464"/>
-    </fill>
-  </Path>
-  <Path data="M 14 24 C 14 18 19 13 25 13 C 31 13 36 18 36 24 C 36 30 31 35 25 35 C 19 35 14 30 14 24 Z " scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="25" y="13" scaleX="22" rotation="90">
-        <GradientEntry color="#787878" ratio="0" alpha="1"/>
-        <GradientEntry color="#969696" ratio="1" alpha="1"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+	<Path data="M 13 24 C 13 18 19 12 25 12 C 31 12 37 18 37 24 C 37 30 31 36 25 36 C 19 36 13 30 13 24 Z ">
+		<fill>
+			<SolidColor color="#646464"/>
+		</fill>
+	</Path>
+	<Path data="M 14 24 C 14 18 19 13 25 13 C 31 13 36 18 36 24 C 36 30 31 35 25 35 C 19 35 14 30 14 24 Z ">
+		<fill>
+			<LinearGradient x = "25" y = "13" scaleX = "22" rotation = "90">
+				<GradientEntry color="#787878" ratio="0" alpha="1"/>
+				<GradientEntry color="#969696" ratio="1" alpha="1"/>
+			</LinearGradient>
+		</fill>
+	</Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/RadioButton_downSymbolSelected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/RadioButton_downSymbolSelected.fxg
index e504ef7..591b60e 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/RadioButton_downSymbolSelected.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/RadioButton_downSymbolSelected.fxg
@@ -17,19 +17,18 @@
   limitations under the License.
 
 -->
-
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path data="M 13 24 C 13 18 19 12 25 12 C 31 12 37 18 37 24 C 37 30 30 36 24 36 C 18 36 13 30 13 24 Z " scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#323232"/>
-    </fill>
-  </Path>
-  <Path data="M 14 24 C 14 18 19 13 25 13 C 31 13 36 18 36 24 C 36 30 30 35 24 35 C 18 35 14 30 14 24 Z " scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="24" y="13" scaleX="22" rotation="90">
-        <GradientEntry color="#464646" ratio="0" alpha="1"/>
-        <GradientEntry color="#1e1e1e" ratio="1" alpha="1"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+	<Path data="M 13 24 C 13 18 19 12 25 12 C 31 12 37 18 37 24 C 37 30 30 36 24 36 C 18 36 13 30 13 24 Z ">
+		<fill>
+			<SolidColor color="#323232"/>
+		</fill>
+	</Path>
+	<Path data="M 14 24 C 14 18 19 13 25 13 C 31 13 36 18 36 24 C 36 30 30 35 24 35 C 18 35 14 30 14 24 Z ">
+		<fill>
+			<LinearGradient x = "24" y = "13" scaleX = "22" rotation = "90">
+				<GradientEntry color="#464646" ratio="0" alpha="1"/>
+				<GradientEntry color="#1e1e1e" ratio="1" alpha="1"/>
+			</LinearGradient>
+		</fill>
+	</Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/RadioButton_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/RadioButton_up.fxg
index 4dbb4d4..de1e72e 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/RadioButton_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/RadioButton_up.fxg
@@ -18,26 +18,28 @@
 
 -->
 
+
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path data="M 2 24 C 2 11 12 1 25 1 C 38 1 48 11 48 24 C 48 37 38 47 25 47 C 12 47 2 37 2 24 Z M 1 24 C 1 37 12 48 25 48 C 38 48 49 37 49 24 C 49 11 38 0 25 0 C 12 0 1 11 1 24 Z " blendMode="normal" alpha="1" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="25" y="0" scaleX="48" rotation="90">
-        <GradientEntry color="#000000" ratio="0" alpha="0"/>
-        <GradientEntry color="#000000" ratio="1" alpha="0.14901960784313725"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path data="M 3 24 C 3 11 12 2 25 2 C 38 2 47 11 47 24 C 47 37 38 46 25 46 C 12 46 3 37 3 24 Z " blendMode="normal" alpha="1" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="25" y="8" scaleX="21" rotation="90">
-        <GradientEntry color="#ffffff" ratio="0" alpha="0.8"/>
-        <GradientEntry color="#ffffff" ratio="1" alpha="0"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path data="M 3 24 C 3 11 12 2 25 2 C 38 2 47 11 47 24 C 47 37 38 46 25 46 C 12 46 3 37 3 24 Z M 2 24 C 2 37 12 47 25 47 C 38 47 48 37 48 24 C 48 11 38 1 25 1 C 12 1 2 11 2 24 Z " blendMode="normal" alpha="0.6" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#000000"/>
-    </fill>
-  </Path>
+	
+		<Path data="M 2 24 C 2 11 12 1 25 1 C 38 1 48 11 48 24 C 48 37 38 47 25 47 C 12 47 2 37 2 24 Z M 1 24 C 1 37 12 48 25 48 C 38 48 49 37 49 24 C 49 11 38 0 25 0 C 12 0 1 11 1 24 Z " blendMode="normal" alpha="1">
+			<fill>
+				<LinearGradient x = "25" y = "0" scaleX = "48" rotation = "90">
+					<GradientEntry color="#000000" ratio="0" alpha="0"/>
+					<GradientEntry color="#000000" ratio="1" alpha="0.14901960784313725"/>
+				</LinearGradient>
+			</fill>
+		</Path>
+		<Path data="M 3 24 C 3 11 12 2 25 2 C 38 2 47 11 47 24 C 47 37 38 46 25 46 C 12 46 3 37 3 24 Z " blendMode="normal" alpha="1">
+			<fill>
+				<LinearGradient x = "25" y = "8" scaleX = "21" rotation = "90">
+					<GradientEntry color="#ffffff" ratio="0" alpha="0.8"/>
+					<GradientEntry color="#ffffff" ratio="1" alpha="0"/>
+				</LinearGradient>
+			</fill>
+		</Path>
+		<Path data="M 3 24 C 3 11 12 2 25 2 C 38 2 47 11 47 24 C 47 37 38 46 25 46 C 12 46 3 37 3 24 Z M 2 24 C 2 37 12 47 25 47 C 38 47 48 37 48 24 C 48 11 38 1 25 1 C 12 1 2 11 2 24 Z " blendMode="normal" alpha="0.6">
+			<fill>
+				<SolidColor color="#000000"/>
+			</fill>
+		</Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/RadioButton_upSymbol.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/RadioButton_upSymbol.fxg
index 31d312e..10ac407 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/RadioButton_upSymbol.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/RadioButton_upSymbol.fxg
@@ -17,19 +17,18 @@
   limitations under the License.
 
 -->
-
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path data="M 13 24 C 13 18 19 12 25 12 C 31 12 37 18 37 24 C 37 30 31 36 25 36 C 19 36 13 30 13 24 Z " scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#969696"/>
-    </fill>
-  </Path>
-  <Path data="M 14 24 C 14 18 19 13 25 13 C 31 13 36 18 36 24 C 36 30 31 35 25 35 C 19 35 14 30 14 24 Z " scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="25" y="13" scaleX="14" rotation="90">
-        <GradientEntry color="#999999" ratio="0" alpha="1"/>
-        <GradientEntry color="#b4b4b4" ratio="1" alpha="1"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+	<Path data="M 13 24 C 13 18 19 12 25 12 C 31 12 37 18 37 24 C 37 30 31 36 25 36 C 19 36 13 30 13 24 Z ">
+		<fill>
+			<SolidColor color="#969696"/>
+		</fill>
+	</Path>
+	<Path data="M 14 24 C 14 18 19 13 25 13 C 31 13 36 18 36 24 C 36 30 31 35 25 35 C 19 35 14 30 14 24 Z ">
+		<fill>
+			<LinearGradient x = "25" y = "13" scaleX = "14" rotation = "90">
+				<GradientEntry color="#999999" ratio="0" alpha="1"/>
+				<GradientEntry color="#b4b4b4" ratio="1" alpha="1"/>
+			</LinearGradient>
+		</fill>
+	</Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/RadioButton_upSymbolSelected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/RadioButton_upSymbolSelected.fxg
index e9f4564..f163e69 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/RadioButton_upSymbolSelected.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/RadioButton_upSymbolSelected.fxg
@@ -17,19 +17,18 @@
   limitations under the License.
 
 -->
-
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path data="M 13 24 C 13 18 19 12 25 12 C 31 12 37 18 37 24 C 37 30 31 36 25 36 C 19 36 13 30 13 24 Z " scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#323232"/>
-    </fill>
-  </Path>
-  <Path data="M 14 24 C 14 18 19 13 25 13 C 31 13 36 18 36 24 C 36 30 31 35 25 35 C 19 35 14 30 14 24 Z " scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient x="25" y="13" scaleX="22" rotation="90">
-        <GradientEntry color="#5a5a5a" ratio="0" alpha="1"/>
-        <GradientEntry color="#323232" ratio="1" alpha="1"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+	<Path data="M 13 24 C 13 18 19 12 25 12 C 31 12 37 18 37 24 C 37 30 31 36 25 36 C 19 36 13 30 13 24 Z ">
+		<fill>
+			<SolidColor color="#323232"/>
+		</fill>
+	</Path>
+	<Path data="M 14 24 C 14 18 19 13 25 13 C 31 13 36 18 36 24 C 36 30 31 35 25 35 C 19 35 14 30 14 24 Z ">
+		<fill>
+			<LinearGradient x = "25" y = "13" scaleX = "22" rotation = "90">
+				<GradientEntry color="#5a5a5a" ratio="0" alpha="1"/>
+				<GradientEntry color="#323232" ratio="1" alpha="1"/>
+			</LinearGradient>
+		</fill>
+	</Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/SpinnerListContainerBackground.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/SpinnerListContainerBackground.fxg
index f07f0cb..30a312c 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/SpinnerListContainerBackground.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/SpinnerListContainerBackground.fxg
@@ -17,16 +17,17 @@
   limitations under the License.
 
 -->
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008" viewHeight= "100" viewWidth= "100"
+	scaleGridLeft="8" scaleGridTop="8" scaleGridRight="92" scaleGridBottom="92">
 
-<Graphic version="2.0" viewHeight="100" viewWidth="100" scaleGridLeft="8" scaleGridTop="8" scaleGridRight="92" scaleGridBottom="92" xmlns="http://ns.adobe.com/fxg/2008">
-  <Rect width="100" height="100" radiusX="8" radiusY="8" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#4D4D4D"/>
-    </fill>
-  </Rect>
-  <Rect x="1" y="1" width="98" height="98" radiusX="8" radiusY="8" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#F2F2F2"/>
-    </fill>
-  </Rect>
+	<Rect width="100" height="100" radiusX="8" radiusY="8">
+		<fill>
+			<SolidColor color="#4D4D4D"/>
+		</fill>
+	</Rect>
+	<Rect x="1" y="1" width="98" height="98" radiusX="8" radiusY="8">
+		<fill>	
+			<SolidColor color="#F2F2F2"/>
+		</fill>
+	</Rect>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/SpinnerListContainerSelectionIndicator.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/SpinnerListContainerSelectionIndicator.fxg
index 9ec012c..bd553bd 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/SpinnerListContainerSelectionIndicator.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/SpinnerListContainerSelectionIndicator.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,51 +17,51 @@
   limitations under the License.
 
 -->
-
-<Graphic version="2.0" viewHeight="72" viewWidth="100" scaleGridLeft="3" scaleGridTop="8" scaleGridRight="97" scaleGridBottom="63" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- Transparent rect used to center the bar -->
-  <Rect x="0" y="0" width="100" height="6" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- Border -->
-  <Path y="6" winding="nonZero" data="M100 60 0 60 0 0 100 0 100 60ZM1 59 99 59 99 1 1 1 1 59Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#666666"/>
-    </fill>
-  </Path>
-  <!-- Two tone gradient background -->
-  <Rect x="1" y="7" width="98" height="58" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient rotation="90">
-        <GradientEntry ratio="0.0" color="#E6E6E6" alpha="0.2"/>
-        <GradientEntry ratio="0.2" color="#E6E6E6" alpha="0.4"/>
-        <GradientEntry ratio="0.5" color="#E6E6E6" alpha="0.3"/>
-        <GradientEntry ratio="0.5" color="#000000" alpha="0.12"/>
-        <GradientEntry ratio="1.0" color="#000000" alpha="0.2"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- Top highlight -->
-  <Rect x="2" y="7" width="96" height="1" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#FFFFFF"/>
-    </fill>
-  </Rect>
-  <!-- Bottom highlight -->
-  <Rect x="2" y="64" width="96" height="1" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#FFFFFF"/>
-    </fill>
-  </Rect>
-  <!-- Shadow -->
-  <Rect x="2" y="66" width="96" height="6" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient rotation="90">
-        <GradientEntry ratio="0" color="#000000" alpha="0.15"/>
-        <GradientEntry ratio="1" color="#000000" alpha="0"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-</Graphic>
\ No newline at end of file
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008" viewHeight="72" viewWidth="100"
+	scaleGridLeft="3" scaleGridTop="8" scaleGridRight="97" scaleGridBottom="63">
+	<!-- Transparent rect used to center the bar -->
+	<Rect x="0" y="0" width="100" height="6">
+		<fill>
+			<SolidColor color="#000000" alpha="0"/>
+		</fill>
+	</Rect>
+	<!-- Border --> 
+	<Path y="6" winding="nonZero" data="M100 60 0 60 0 0 100 0 100 60ZM1 59 99 59 99 1 1 1 1 59Z">
+    	<fill>
+        	<SolidColor color="#666666"/>
+		</fill>
+	</Path>
+	<!-- Two tone gradient background -->
+	<Rect x="1" y="7" width="98" height="58">
+    	<fill>
+        	<LinearGradient rotation="90">
+            	<GradientEntry ratio="0.0" color="#E6E6E6" alpha="0.2"/>
+				<GradientEntry ratio="0.2" color="#E6E6E6" alpha="0.4"/>
+				<GradientEntry ratio="0.5" color="#E6E6E6" alpha="0.3"/>
+				<GradientEntry ratio="0.5" color="#000000" alpha="0.12"/>
+				<GradientEntry ratio="1.0" color="#000000" alpha="0.2"/>
+			</LinearGradient>
+		</fill>
+	</Rect>
+	<!-- Top highlight -->
+	<Rect x="2" y="7" width="96" height="1">
+    	<fill>
+        	<SolidColor color="#FFFFFF"/>
+        </fill>
+	</Rect>
+	<!-- Bottom highlight -->
+	<Rect x="2" y="64" width="96" height="1">
+    	<fill>
+        	<SolidColor color="#FFFFFF"/>
+        </fill>
+	</Rect>
+	<!-- Shadow -->
+	<Rect x="2" y="66" width="96" height="6">
+		<fill>
+			<LinearGradient rotation="90">
+				<GradientEntry ratio="0" color="#000000" alpha="0.15"/>
+				<GradientEntry ratio="1" color="#000000" alpha="0"/>
+			</LinearGradient>
+        </fill>
+	</Rect>
+</Graphic>
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/SpinnerListContainerShadow.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/SpinnerListContainerShadow.fxg
index 8b31f56..2ee6e4d 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/SpinnerListContainerShadow.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/SpinnerListContainerShadow.fxg
@@ -17,16 +17,16 @@
   limitations under the License.
 
 -->
-
-<Graphic version="2.0" viewHeight="100" viewWidth="100" scaleGridLeft="8" scaleGridTop="8" scaleGridRight="92" scaleGridBottom="92" xmlns="http://ns.adobe.com/fxg/2008">
-  <Rect width="100" height="100" radiusX="8" radiusY="8" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient rotation="270">
-        <GradientEntry ratio="0.0" color="#231F20" alpha="0.7"/>
-        <GradientEntry ratio="0.35" color="#FFFFFF" alpha="0"/>
-        <GradientEntry ratio="0.75" color="#EAE9E9" alpha="0"/>
-        <GradientEntry ratio="1.0" color="#231F20" alpha="0.65"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008" viewHeight= "100" viewWidth= "100"
+	scaleGridLeft="8" scaleGridTop="8" scaleGridRight="92" scaleGridBottom="92">
+	<Rect width="100" height="100" radiusX="8" radiusY="8">
+		<fill>
+			<LinearGradient rotation="270">
+				<GradientEntry ratio="0.0" color="#231F20" alpha="0.7"/>
+				<GradientEntry ratio="0.35" color="#FFFFFF" alpha="0"/>
+				<GradientEntry ratio="0.75" color="#EAE9E9" alpha="0"/>
+				<GradientEntry ratio="1.0" color="#231F20" alpha="0.65"/>
+			</LinearGradient>
+		</fill>
+	</Rect>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/TextInput_border.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/TextInput_border.fxg
index 01a567d..bb3442a 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/TextInput_border.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/TextInput_border.fxg
@@ -18,17 +18,22 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="8" scaleGridTop="8" scaleGridRight="290" scaleGridBottom="42" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- border -->
-  <Path data="M 7 1 C 7 1 291 1 291 1 C 294 1 297 4 297 7 C 297 7 297 43 297 43 C 297 46 294 49 291 49 C 291 49 7 49 7 49 C 4 49 1 46 1 43 C 1 43 1 7 1 7 C 1 4 4 1 7 1 Z M 7 0 C 3 0 0 3 0 7 C 0 7 0 43 0 43 C 0 47 3 50 7 50 C 7 50 291 50 291 50 C 295 50 298 47 298 43 C 298 43 298 7 298 7 C 298 3 295 0 291 0 C 291 0 7 0 7 0 Z " alpha="1" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#505050"/>
-    </fill>
-  </Path>
-  <!-- inner shadow -->
-  <Path data="M 7 3 C 7 3 290 3 290 3 C 293 3 296 4 296 7 C 296 7 296 43 296 43 C 296 46 293 48 290 48 C 290 48 8 48 8 48 C 5 48 2 46 2 43 C 2 43 2 7 2 7 C 2 4 4 3 7 3 Z M 7 1 C 4 1 1 4 1 7 C 1 7 1 43 1 43 C 1 46 4 49 7 49 C 7 49 291 49 291 49 C 294 49 297 46 297 43 C 297 43 297 7 297 7 C 297 4 294 1 291 1 C 291 1 7 1 7 1 Z " alpha="0.2" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <SolidColor color="#030303"/>
-    </fill>
-  </Path>
+
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008" 
+         scaleGridLeft="8" scaleGridTop="8" scaleGridRight="290" scaleGridBottom="42">
+
+    <!-- border -->
+    <Path data="M 7 1 C 7 1 291 1 291 1 C 294 1 297 4 297 7 C 297 7 297 43 297 43 C 297 46 294 49 291 49 C 291 49 7 49 7 49 C 4 49 1 46 1 43 C 1 43 1 7 1 7 C 1 4 4 1 7 1 Z M 7 0 C 3 0 0 3 0 7 C 0 7 0 43 0 43 C 0 47 3 50 7 50 C 7 50 291 50 291 50 C 295 50 298 47 298 43 C 298 43 298 7 298 7 C 298 3 295 0 291 0 C 291 0 7 0 7 0 Z " alpha="1">
+        <fill>
+            <SolidColor color="#505050"/>
+        </fill>
+    </Path>
+    
+    <!-- inner shadow -->
+    <Path data="M 7 3 C 7 3 290 3 290 3 C 293 3 296 4 296 7 C 296 7 296 43 296 43 C 296 46 293 48 290 48 C 290 48 8 48 8 48 C 5 48 2 46 2 43 C 2 43 2 7 2 7 C 2 4 4 3 7 3 Z M 7 1 C 4 1 1 4 1 7 C 1 7 1 43 1 43 C 1 46 4 49 7 49 C 7 49 291 49 291 49 C 294 49 297 46 297 43 C 297 43 297 7 297 7 C 297 4 294 1 291 1 C 291 1 7 1 7 1 Z " alpha="0.2">
+        <fill>
+            <SolidColor color="#030303"/>
+        </fill>
+    </Path>
+    
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ToggleSwitch_contentShadow.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ToggleSwitch_contentShadow.fxg
index 46e9d48..2551f8f 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ToggleSwitch_contentShadow.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/ToggleSwitch_contentShadow.fxg
@@ -17,15 +17,14 @@
   limitations under the License.
 
 -->
-
-<Graphic version="2.0" viewHeight="42" viewWidth="106" scaleGridLeft="21" scaleGridTop="10" scaleGridRight="85" scaleGridBottom="21" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path winding="nonZero" data="M0 0 0 42 21 42C15 42 10.5 37.2993 10.5 31.5 10.5 25.7007 15 21 21 21L85.0005 21C91.0005 21 95.5005 25.7007 95.5005 31.5 95.5005 37.2993 91.0005 42 85.0005 42L106 42 106 0 0 0Z" scaleX="0.5" scaleY="0.5">
-    <fill>
-      <LinearGradient rotation="90">
-        <GradientEntry ratio="0" alpha="0.1"/>
-        <GradientEntry ratio="0.5" alpha="0.2"/>
-        <GradientEntry ratio="1" alpha="0.1"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+<Graphic version="2.0" viewHeight="42" viewWidth="106" xmlns="http://ns.adobe.com/fxg/2008" scaleGridLeft="21" scaleGridTop="10" scaleGridRight="85" scaleGridBottom="21">
+	<Path winding="nonZero" data="M0 0 0 42 21 42C15 42 10.5 37.2993 10.5 31.5 10.5 25.7007 15 21 21 21L85.0005 21C91.0005 21 95.5005 25.7007 95.5005 31.5 95.5005 37.2993 91.0005 42 85.0005 42L106 42 106 0 0 0Z">
+		<fill>
+			<LinearGradient rotation="90">
+				<GradientEntry ratio="0" alpha="0.1"/>
+				<GradientEntry ratio="0.5" alpha="0.2"/>
+				<GradientEntry ratio="1" alpha="0.1"/>
+			</LinearGradient>
+		</fill>
+	</Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile160/assets/Button_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile160/assets/Button_up.fxg
index 2bb985a..0e30e2e 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile160/assets/Button_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile160/assets/Button_up.fxg
@@ -19,8 +19,7 @@
 -->
 
 
-<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008" viewHeight= "43" viewWidth= "146"
-	scaleGridLeft="10" scaleGridTop="10" scaleGridRight="136" scaleGridBottom="33">
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008" viewHeight= "43" viewWidth= "146" scaleGridLeft="10" scaleGridTop="10" scaleGridRight="136" scaleGridBottom="33">
 	<!-- Outer Border -->
 	<Path data="M 6 1 C 6 1 140 1 140 1 C 143 1 145 3 145 6 C 145 6 145 37 145 37 C 145 40 143 42 140 42 C 140 42 6 42 6 42 C 3 42 1 40 1 37 C 1 37 1 6 1 6 C 1 3 3 1 6 1 Z M 6 0 C 3 0 0 3 0 6 C 0 6 0 37 0 37 C 0 40 3 43 6 43 C 6 43 140 43 140 43 C 143 43 146 40 146 37 C 146 37 146 6 146 6 C 146 3 143 0 140 0 C 140 0 6 0 6 0 Z">
 		<fill>
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile240/assets/Button_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile240/assets/Button_up.fxg
index 991299f..0463d74 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile240/assets/Button_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile240/assets/Button_up.fxg
@@ -18,8 +18,7 @@
 
 -->
 
-<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008" viewHeight= "65" viewWidth= "220"
-	scaleGridLeft="14" scaleGridTop="14" scaleGridRight="206" scaleGridBottom="51">
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008" viewHeight= "65" viewWidth= "220" scaleGridLeft="14" scaleGridTop="14" scaleGridRight="206" scaleGridBottom="51">
 		
 	<!-- Border -->
 	<Path data="M 8 1 C 8 1 212 1 212 1 C 216 1 219 4 219 8 C 219 8 219 57 219 57 C 219 61 216 64 212 64 C 212 64 8 64 8 64 C 4 64 1 61 1 57 C 1 57 1 8 1 8 C 1 4 4 1 8 1 Z M 0 57 C 0 61 4 65 8 65 C 8 65 212 65 212 65 C 216 65 220 61 220 57 C 220 57 220 8 220 8 C 220 4 216 0 212 0 C 212 0 8 0 8 0 C 4 0 0 4 0 8 C 0 8 0 57 0 57 Z " alpha="1">
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile320/assets/Button_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile320/assets/Button_up.fxg
index 99040ab..d2e636d 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile320/assets/Button_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile320/assets/Button_up.fxg
@@ -19,8 +19,7 @@
 -->
 
 
-<Graphic version="2.0" viewHeight="86" viewWidth="292" xmlns="http://ns.adobe.com/fxg/2008"
-	scaleGridLeft="20" scaleGridRight="272" scaleGridTop="20" scaleGridBottom="66">
+<Graphic version="2.0" viewHeight="86" viewWidth="292" xmlns="http://ns.adobe.com/fxg/2008" scaleGridLeft="20" scaleGridRight="272" scaleGridTop="20" scaleGridBottom="66">
 	<!-- Outer Border -->
 	<Path data="M12 2 280 2C286 2 290 6 290 12L290 74C290 80 286 84 280 84L12 84C6 84 2 80 2 74L2 12C2 6 6 2 12 2ZM12 0C6 0 0 6 0 12L0 74C0 80 6 86 12 86L280 86C286 86 292 80 292 74L292 12C292 6 286 0 280 0L12 0Z">
     	<fill>
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ActionBarBackground.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ActionBarBackground.fxg
index fc86656..b975f7e 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ActionBarBackground.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ActionBarBackground.fxg
@@ -18,81 +18,85 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="2" scaleGridTop="3" scaleGridRight="88" scaleGridBottom="61" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- border top -->
-  <Rect x="0" y="0" width="90" height="2" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.75"/>
-    </fill>
-  </Rect>
-  <!-- border bottom -->
-  <Rect x="0" y="62" width="90" height="2" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.85"/>
-    </fill>
-  </Rect>
-  <!-- drop shadow (6 filled rects) -->
-  <Rect x="0" y="64" width="90" height="1" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.35"/>
-    </fill>
-  </Rect>
-  <Rect x="0" y="65" width="90" height="1" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.25"/>
-    </fill>
-  </Rect>
-  <Rect x="0" y="66" width="90" height="1" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.2"/>
-    </fill>
-  </Rect>
-  <Rect x="0" y="67" width="90" height="1" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.15"/>
-    </fill>
-  </Rect>
-  <Rect x="0" y="68" width="90" height="1" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.1"/>
-    </fill>
-  </Rect>
-  <Rect x="0" y="69" width="90" height="1" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.05"/>
-    </fill>
-  </Rect>
-  <!-- highlight border -->
-  <Rect x="1" y="2" width="88" height="1" alpha=".25" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#ffffff"/>
-    </fill>
-  </Rect>
-  <Rect x="1" y="61" width="88" height="1" alpha="0.1" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#ffffff"/>
-    </fill>
-  </Rect>
-  <Rect x="0" y="2" width="1" height="60" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="0" scaleX="60" rotation="90">
-        <GradientEntry color="#ffffff" ratio="0" alpha=".25"/>
-        <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <Rect x="89" y="2" width="1" height="60" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="0" scaleX="60" rotation="90">
-        <GradientEntry color="#ffffff" ratio="0" alpha=".25"/>
-        <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="0" width="90" height="70" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="2" scaleGridTop="3" scaleGridRight="88" scaleGridBottom="61">
+    
+    <!-- border top -->
+    <Rect x="0" y="0" width="90" height="2">
+        <fill>
+            <SolidColor color="#000000" alpha="0.75"/>
+        </fill>
+    </Rect>
+    <!-- border bottom -->
+    <Rect x="0" y="62" width="90" height="2">
+        <fill>
+            <SolidColor color="#000000" alpha="0.85"/>
+        </fill>
+    </Rect>
+    <!-- drop shadow (6 filled rects) -->
+    <Rect x="0" y="64" width="90" height="1">
+        <fill>
+            <SolidColor color="#000000" alpha="0.35"/>
+        </fill>
+    </Rect>
+    <Rect x="0" y="65" width="90" height="1">
+        <fill>
+            <SolidColor color="#000000" alpha="0.25"/>
+        </fill>
+    </Rect>
+    <Rect x="0" y="66" width="90" height="1">
+        <fill>
+            <SolidColor color="#000000" alpha="0.2"/>
+        </fill>
+    </Rect>
+    <Rect x="0" y="67" width="90" height="1">
+        <fill>
+            <SolidColor color="#000000" alpha="0.15"/>
+        </fill>
+    </Rect>
+    <Rect x="0" y="68" width="90" height="1">
+        <fill>
+            <SolidColor color="#000000" alpha="0.1"/>
+        </fill>
+    </Rect>
+    <Rect x="0" y="69" width="90" height="1">
+        <fill>
+            <SolidColor color="#000000" alpha="0.05"/>
+        </fill>
+    </Rect>
+    
+    <!-- highlight border -->
+    <Rect x="1" y="2" width="88" height="1" alpha=".25">
+        <fill>
+        	<SolidColor color="#ffffff"/>
+        </fill>
+    </Rect>
+    <Rect x="1" y="61" width="88" height="1" alpha="0.1">
+        <fill>
+        	<SolidColor color="#ffffff"/>
+        </fill>
+    </Rect>
+    <Rect x="0" y="2" width="1" height="60">
+        <fill>
+            <LinearGradient x="0" scaleX="60" rotation="90">
+                <GradientEntry color="#ffffff" ratio="0" alpha=".25"/>
+                <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+    <Rect x="89" y="2" width="1" height="60">
+        <fill>
+            <LinearGradient x="0" scaleX="60" rotation="90">
+                <GradientEntry color="#ffffff" ratio="0" alpha=".25"/>
+                <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+    
+    <!-- invisible fix for scaling -->
+    <Rect x="0" y="0" width="90" height="70">
+        <fill>
+            <SolidColor color="#ffffff" alpha="0"/>
+        </fill>
+    </Rect>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/BeveledActionButton_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/BeveledActionButton_down.fxg
index 15098b4..5c894eb 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/BeveledActionButton_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/BeveledActionButton_down.fxg
@@ -18,35 +18,44 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="8" scaleGridRight="48" scaleGridTop="8" scaleGridBottom="48" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="0" width="56" height="56" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- border -->
-  <Path winding="nonZero" data="M56 48C56 52.418 52.418 56 48 56L8 56C3.58203 56 0 52.418 0 48L0 7.93848C0 3.521 3.58203 0 8 0L48 0C52.418 0 56 3.521 56 7.93848L56 48ZM54.667 8C54.667 4.31836 51.6821 1.3335 48 1.3335L8 1.3335C4.31836 1.3335 1.3335 4.31836 1.3335 8L1.3335 48&#xD;&#xA;C1.3335 51.6826 4.31836 54.667 8 54.667L48 54.667C51.6821 54.667 54.667 51.6826 54.667 48L54.667 8Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#323232"/>
-    </fill>
-  </Path>
-  <!-- shadow fill -->
-  <Rect x="1.3335" y="1.3335" width="53.3335" height="53.3335" radiusX="6.66885" radiusY="6.66885" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="26.667" y="0" scaleX="30.1528" rotation="90">
-        <GradientEntry ratio="0" alpha="0.25"/>
-        <GradientEntry ratio="1" alpha="0"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- inner highlight -->
-  <Path x="1.3335" y="1.3335" winding="nonZero" data="M46.6665 1.3335C49.606 1.3335 51.9995 3.72607 51.9995 6.6665L51.9995 46.6665C51.9995 49.606 49.606 51.9995 46.6665 51.9995L6.6665 51.9995C3.72607 51.9995 1.3335 49.606 1.3335 46.6665L1.3335 6.6665C1.3335 3.72607 3.72607 1.3335 6.6665 1.3335L46.6665&#xD;&#xA; 1.3335ZM46.6665 0 6.6665 0C2.98486 0 0 2.98486 0 6.6665L0 46.6665C0 50.3491 2.98486 53.3335 6.6665 53.3335L46.6665 53.3335C50.3486 53.3335 53.3335 50.3491 53.3335 46.6665L53.3335 6.6665C53.3335 2.98486 50.3486 0 46.6665 0L46.6665 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="26.667" y="1.3335" scaleX="50.6673" rotation="90">
-        <GradientEntry ratio="0" color="#FFFFFF" alpha="0.05"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="8" scaleGridRight="48" scaleGridTop="8" scaleGridBottom="48">
+
+    <!-- invisible fix for scaling -->
+    <Rect x="0" y="0" width="56" height="56">
+        <fill>
+            <SolidColor color="#ffffff" alpha="0"/>
+        </fill>
+    </Rect>
+
+
+    <!-- border -->
+      <Path winding="nonZero" data="M56 48C56 52.418 52.418 56 48 56L8 56C3.58203 56 0 52.418 0 48L0 7.93848C0 3.521 3.58203 0 8 0L48 0C52.418 0 56 3.521 56 7.93848L56 48ZM54.667 8C54.667 4.31836 51.6821 1.3335 48 1.3335L8 1.3335C4.31836 1.3335 1.3335 4.31836 1.3335 8L1.3335 48
+C1.3335 51.6826 4.31836 54.667 8 54.667L48 54.667C51.6821 54.667 54.667 51.6826 54.667 48L54.667 8Z">
+        <fill>
+          <SolidColor color="#323232"/>
+        </fill>
+      </Path>
+
+    <!-- shadow fill -->
+      <Rect x="1.3335" y="1.3335" width="53.3335" height="53.3335" radiusX="6.66885" radiusY="6.66885">
+        <fill>
+          <LinearGradient x="26.667" y="0" scaleX="30.1528" rotation="90">
+            <GradientEntry ratio="0" alpha="0.25"/>
+            <GradientEntry ratio="1" alpha="0"/>
+          </LinearGradient>
+        </fill>
+      </Rect>
+
+    <!-- inner highlight -->
+      <Path x="1.3335" y="1.3335" winding="nonZero" data="M46.6665 1.3335C49.606 1.3335 51.9995 3.72607 51.9995 6.6665L51.9995 46.6665C51.9995 49.606 49.606 51.9995 46.6665 51.9995L6.6665 51.9995C3.72607 51.9995 1.3335 49.606 1.3335 46.6665L1.3335 6.6665C1.3335 3.72607 3.72607 1.3335 6.6665 1.3335L46.6665
+ 1.3335ZM46.6665 0 6.6665 0C2.98486 0 0 2.98486 0 6.6665L0 46.6665C0 50.3491 2.98486 53.3335 6.6665 53.3335L46.6665 53.3335C50.3486 53.3335 53.3335 50.3491 53.3335 46.6665L53.3335 6.6665C53.3335 2.98486 50.3486 0 46.6665 0L46.6665 0Z">
+        <fill>
+          <LinearGradient x="26.667" y="1.3335" scaleX="50.6673" rotation="90">
+            <GradientEntry ratio="0" color="#FFFFFF" alpha="0.05"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/BeveledActionButton_fill.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/BeveledActionButton_fill.fxg
index 6c1d735..f42c38c 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/BeveledActionButton_fill.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/BeveledActionButton_fill.fxg
@@ -18,17 +18,21 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="8" scaleGridRight="48" scaleGridTop="8" scaleGridBottom="48" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="0" width="56" height="56" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- chromeColor fill -->
-  <Rect x="1.3335" y="1.3335" width="53.3335" height="53.3335" radiusX="6.66885" radiusY="6.66885" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#484848"/>
-    </fill>
-  </Rect>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="8" scaleGridRight="48" scaleGridTop="8" scaleGridBottom="48">
+
+    <!-- invisible fix for scaling -->
+    <Rect x="0" y="0" width="56" height="56">
+        <fill>
+            <SolidColor color="#ffffff" alpha="0"/>
+        </fill>
+    </Rect>
+
+    <!-- chromeColor fill -->
+      <Rect x="1.3335" y="1.3335" width="53.3335" height="53.3335" radiusX="6.66885" radiusY="6.66885">
+        <fill>
+          <SolidColor color="#484848"/>
+        </fill>
+      </Rect>
+
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/BeveledActionButton_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/BeveledActionButton_up.fxg
index 5656eaa..9c35d54 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/BeveledActionButton_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/BeveledActionButton_up.fxg
@@ -18,37 +18,46 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="8" scaleGridRight="48" scaleGridTop="8" scaleGridBottom="48" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="0" width="56" height="56" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- border -->
-  <Path winding="nonZero" data="M56 48C56 52.418 52.418 56 48 56L8 56C3.58203 56 0 52.418 0 48L0 7.93848C0 3.521 3.58203 0 8 0L48 0C52.418 0 56 3.521 56 7.93848L56 48ZM54.667 8C54.667 4.31836 51.6821 1.3335 48 1.3335L8 1.3335C4.31836 1.3335 1.3335 4.31836 1.3335 8L1.3335 48&#xD;&#xA;C1.3335 51.6826 4.31836 54.667 8 54.667L48 54.667C51.6821 54.667 54.667 51.6826 54.667 48L54.667 8Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#323232"/>
-    </fill>
-  </Path>
-  <!-- shadow fill -->
-  <Rect x="1.3335" y="1.3335" width="53.3335" height="53.3335" radiusX="6.66885" radiusY="6.66885" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="26.667" y="0" scaleX="53.334" rotation="90">
-        <GradientEntry ratio="0" color="#FFFFFF" alpha="0.4"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- inner highlight -->
-  <Path x="1.3335" y="1.3335" winding="nonZero" data="M46.6665 1.3335C49.606 1.3335 51.9995 3.72607 51.9995 6.6665L51.9995 46.6665C51.9995 49.606 49.606 51.9995 46.6665 51.9995L6.6665 51.9995C3.72607 51.9995 1.3335 49.606 1.3335 46.6665L1.3335 6.6665C1.3335 3.72607 3.72607 1.3335 6.6665 1.3335L46.6665&#xD;&#xA; 1.3335ZM46.6665 0 6.6665 0C2.98486 0 0 2.98486 0 6.6665L0 46.6665C0 50.3491 2.98486 53.3335 6.6665 53.3335L46.6665 53.3335C50.3486 53.3335 53.3335 50.3491 53.3335 46.6665L53.3335 6.6665C53.3335 2.98486 50.3486 0 46.6665 0L46.6665 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="26.667" y="0" scaleX="53.334" rotation="90">
-        <GradientEntry ratio="0" alpha="0.35"/>
-        <GradientEntry ratio="0.662577" alpha="0.1"/>
-        <GradientEntry ratio="0.871166" color="#FFFFFF" alpha="0.05"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.2"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="8" scaleGridRight="48" scaleGridTop="8" scaleGridBottom="48">
+
+    <!-- invisible fix for scaling -->
+    <Rect x="0" y="0" width="56" height="56">
+        <fill>
+            <SolidColor color="#ffffff" alpha="0"/>
+        </fill>
+    </Rect>
+
+
+    <!-- border -->
+      <Path winding="nonZero" data="M56 48C56 52.418 52.418 56 48 56L8 56C3.58203 56 0 52.418 0 48L0 7.93848C0 3.521 3.58203 0 8 0L48 0C52.418 0 56 3.521 56 7.93848L56 48ZM54.667 8C54.667 4.31836 51.6821 1.3335 48 1.3335L8 1.3335C4.31836 1.3335 1.3335 4.31836 1.3335 8L1.3335 48
+C1.3335 51.6826 4.31836 54.667 8 54.667L48 54.667C51.6821 54.667 54.667 51.6826 54.667 48L54.667 8Z">
+        <fill>
+          <SolidColor color="#323232"/>
+        </fill>
+      </Path>
+
+    <!-- shadow fill -->
+      <Rect x="1.3335" y="1.3335" width="53.3335" height="53.3335" radiusX="6.66885" radiusY="6.66885">
+        <fill>
+          <LinearGradient x="26.667" y="0" scaleX="53.334" rotation="90">
+            <GradientEntry ratio="0" color="#FFFFFF" alpha="0.4"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/>
+          </LinearGradient>
+        </fill>
+      </Rect>
+
+    <!-- inner highlight -->
+      <Path x="1.3335" y="1.3335" winding="nonZero" data="M46.6665 1.3335C49.606 1.3335 51.9995 3.72607 51.9995 6.6665L51.9995 46.6665C51.9995 49.606 49.606 51.9995 46.6665 51.9995L6.6665 51.9995C3.72607 51.9995 1.3335 49.606 1.3335 46.6665L1.3335 6.6665C1.3335 3.72607 3.72607 1.3335 6.6665 1.3335L46.6665
+ 1.3335ZM46.6665 0 6.6665 0C2.98486 0 0 2.98486 0 6.6665L0 46.6665C0 50.3491 2.98486 53.3335 6.6665 53.3335L46.6665 53.3335C50.3486 53.3335 53.3335 50.3491 53.3335 46.6665L53.3335 6.6665C53.3335 2.98486 50.3486 0 46.6665 0L46.6665 0Z">
+        <fill>
+          <LinearGradient x="26.667" y="0" scaleX="53.334" rotation="90">
+            <GradientEntry ratio="0" alpha="0.35"/>
+            <GradientEntry ratio="0.662577" alpha="0.1"/>
+            <GradientEntry ratio="0.871166" color="#FFFFFF" alpha="0.05"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.2"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/BeveledBackButton_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/BeveledBackButton_down.fxg
index 2e90206..f5c5e2e 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/BeveledBackButton_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/BeveledBackButton_down.fxg
@@ -18,35 +18,46 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="26" scaleGridRight="108" scaleGridTop="10" scaleGridBottom="46" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="0" width="116" height="56" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- border -->
-  <Path winding="nonZero" data="M108 1.3335C111.676 1.3335 114.666 4.32422 114.666 8L114.666 48C114.666 51.6758 111.676 54.667 108 54.667L25.3774 54.668C20.3945 54.668 17.8164 49.1543 16.1416 47.4805 16.0859 47.3994 7.12305 35.5176 2 27.8545 7.12891 20.1772 16.1851 8.41016 16.2344&#xD;&#xA; 8.34131 19.2275 4.5791 21.083 1.3335 25.3335 1.3335L108 1.3335 108 1.3335ZM25.3335 0C19.8101 0 18.6875 2.55322 15.1445 7.57178 15.1445 7.57178 5.33301 20 0 28 5.33301 36 15.0469 48.2393 15.0469 48.2393 19.0469 53.5732 20 56 25.3335 56L108 56&#xD;&#xA;C112.418 56 116 52.418 116 48L116 8C116 3.58203 112.418 0 108 0L25.3335 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#323232"/>
-    </fill>
-  </Path>
-  <!-- shadow fill -->
-  <Path x="2" y="1.3335" winding="nonZero" data="M106 0C109.676 0 112.666 2.99072 112.666 6.6665L112.666 46.6665C112.666 50.3423 109.676 53.3335 106 53.3335L23.3774 53.3345C18.3945 53.3345 15.8164 47.8208 14.1416 46.147 14.0859 46.0659 5.12305 34.1841 0 26.521 5.12891 18.8438 14.1851 7.07666&#xD;&#xA; 14.2344 7.00781 17.2275 3.24561 18.9585 0 23.3335 0L106 0 106 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="56.3325" y="0" scaleX="30.1525" rotation="90">
-        <GradientEntry ratio="0" alpha="0.25"/>
-        <GradientEntry ratio="1" alpha="0"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- highlight border -->
-  <Path x="2" y="1.33203" winding="nonZero" data="M106 1.33301C108.94 1.33301 111.334 3.7251 111.334 6.66699L111.334 46.666C111.334 49.6074 108.94 52.001 106 52.001L23.3774 52.001C19.625 52.001 15.0728 45.1279 15.0728 45.1279 11.7827 39.9365 4.44189 30.7852 1.60254 26.521 4.40576 22.3188 15.3125&#xD;&#xA; 7.79443 15.3125 7.79443 15.854 7.02051 19.6455 1.33301 23.3335 1.33301L106 1.33301ZM22.75 0C18.6875 0 16.417 4.26465 14.2344 7.00781 14.1851 7.07715 5.12891 18.8438 0 26.521 5.12305 34.1851 14.0859 46.0664 14.1416 46.1465 15.8164 47.8223 18.3945&#xD;&#xA; 53.335 23.3774 53.335L106 53.335C109.676 53.335 112.666 50.3428 112.666 46.666L112.666 6.66699C112.666 2.99072 109.676 0 106 0L22.75 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="56.3325" y="0" scaleX="57.0461" rotation="90">
-        <GradientEntry ratio="0" color="#FFFFFF" alpha="0.05"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+	scaleGridLeft="26" scaleGridRight="108" scaleGridTop="10" scaleGridBottom="46">
+
+	<!-- invisible fix for scaling -->
+	<Rect x="0" y="0" width="116" height="56">
+		<fill>
+			<SolidColor color="#ffffff" alpha="0"/>
+		</fill>
+	</Rect>
+
+	<!-- border -->
+      <Path winding="nonZero" data="M108 1.3335C111.676 1.3335 114.666 4.32422 114.666 8L114.666 48C114.666 51.6758 111.676 54.667 108 54.667L25.3774 54.668C20.3945 54.668 17.8164 49.1543 16.1416 47.4805 16.0859 47.3994 7.12305 35.5176 2 27.8545 7.12891 20.1772 16.1851 8.41016 16.2344
+ 8.34131 19.2275 4.5791 21.083 1.3335 25.3335 1.3335L108 1.3335 108 1.3335ZM25.3335 0C19.8101 0 18.6875 2.55322 15.1445 7.57178 15.1445 7.57178 5.33301 20 0 28 5.33301 36 15.0469 48.2393 15.0469 48.2393 19.0469 53.5732 20 56 25.3335 56L108 56
+C112.418 56 116 52.418 116 48L116 8C116 3.58203 112.418 0 108 0L25.3335 0Z">
+        <fill>
+          <SolidColor color="#323232"/>
+        </fill>
+      </Path>
+
+	<!-- shadow fill -->
+      <Path x="2" y="1.3335" winding="nonZero" data="M106 0C109.676 0 112.666 2.99072 112.666 6.6665L112.666 46.6665C112.666 50.3423 109.676 53.3335 106 53.3335L23.3774 53.3345C18.3945 53.3345 15.8164 47.8208 14.1416 46.147 14.0859 46.0659 5.12305 34.1841 0 26.521 5.12891 18.8438 14.1851 7.07666
+ 14.2344 7.00781 17.2275 3.24561 18.9585 0 23.3335 0L106 0 106 0Z">
+        <fill>
+          <LinearGradient x="56.3325" y="0" scaleX="30.1525" rotation="90">
+            <GradientEntry ratio="0" alpha="0.25"/>
+            <GradientEntry ratio="1" alpha="0"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+
+	<!-- highlight border -->
+      <Path x="2" y="1.33203" winding="nonZero" data="M106 1.33301C108.94 1.33301 111.334 3.7251 111.334 6.66699L111.334 46.666C111.334 49.6074 108.94 52.001 106 52.001L23.3774 52.001C19.625 52.001 15.0728 45.1279 15.0728 45.1279 11.7827 39.9365 4.44189 30.7852 1.60254 26.521 4.40576 22.3188 15.3125
+ 7.79443 15.3125 7.79443 15.854 7.02051 19.6455 1.33301 23.3335 1.33301L106 1.33301ZM22.75 0C18.6875 0 16.417 4.26465 14.2344 7.00781 14.1851 7.07715 5.12891 18.8438 0 26.521 5.12305 34.1851 14.0859 46.0664 14.1416 46.1465 15.8164 47.8223 18.3945
+ 53.335 23.3774 53.335L106 53.335C109.676 53.335 112.666 50.3428 112.666 46.666L112.666 6.66699C112.666 2.99072 109.676 0 106 0L22.75 0Z">
+        <fill>
+          <LinearGradient x="56.3325" y="0" scaleX="57.0461" rotation="90">
+            <GradientEntry ratio="0" color="#FFFFFF" alpha="0.05"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/BeveledBackButton_fill.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/BeveledBackButton_fill.fxg
index f459f86..81d3387 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/BeveledBackButton_fill.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/BeveledBackButton_fill.fxg
@@ -18,17 +18,22 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="26" scaleGridRight="108" scaleGridTop="10" scaleGridBottom="46" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="0" width="116" height="56" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- chromeColor fill -->
-  <Path x="2" y="1.3335" winding="nonZero" data="M106 0C109.676 0 112.666 2.99121 112.666 6.66699L112.666 46.6675C112.666 50.3413 109.676 53.3335 106 53.3335L23.3784 53.3345C18.3945 53.3345 15.8164 47.8208 14.1416 46.1479 14.0869 46.0669 5.12305 34.1841 0 26.5215 5.12891 18.8438 14.1855 7.07715&#xD;&#xA; 14.2334 7.0083 17.2275 3.24561 19.084 0 23.3335 0L106 0 106 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#484848"/>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+	scaleGridLeft="26" scaleGridRight="108" scaleGridTop="10" scaleGridBottom="46">
+
+	<!-- invisible fix for scaling -->
+	<Rect x="0" y="0" width="116" height="56">
+		<fill>
+			<SolidColor color="#ffffff" alpha="0"/>
+		</fill>
+	</Rect>
+
+	<!-- chromeColor fill -->
+      <Path x="2" y="1.3335" winding="nonZero" data="M106 0C109.676 0 112.666 2.99121 112.666 6.66699L112.666 46.6675C112.666 50.3413 109.676 53.3335 106 53.3335L23.3784 53.3345C18.3945 53.3345 15.8164 47.8208 14.1416 46.1479 14.0869 46.0669 5.12305 34.1841 0 26.5215 5.12891 18.8438 14.1855 7.07715
+ 14.2334 7.0083 17.2275 3.24561 19.084 0 23.3335 0L106 0 106 0Z">
+        <fill>
+          <SolidColor color="#484848"/>
+        </fill>
+      </Path>
+
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/BeveledBackButton_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/BeveledBackButton_up.fxg
index ef73cd0..320f1ab 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/BeveledBackButton_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/BeveledBackButton_up.fxg
@@ -18,37 +18,48 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="26" scaleGridRight="108" scaleGridTop="10" scaleGridBottom="46" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="0" width="116" height="56" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- border -->
-  <Path winding="nonZero" data="M108 1.3335C111.676 1.3335 114.666 4.32373 114.666 8.00049L114.666 48.001C114.666 51.6748 111.676 54.667 108 54.667L25.3784 54.668C20.3945 54.668 17.8164 49.1543 16.1416 47.4814 16.0869 47.4004 7.12305 35.5176 2 27.855 7.12891 20.1772 16.1855&#xD;&#xA; 8.41064 16.2334 8.34082 19.2275 4.5791 21.084 1.3335 25.3335 1.3335L108 1.3335 108 1.3335ZM25.3335 0C19.8091 0 18.6865 2.55322 15.1445 7.57178 15.1445 7.57178 5.33301 19.9995 0 28 5.33301 36 15.0464 48.2393 15.0464 48.2393 19.0464 53.5732 20&#xD;&#xA; 56 25.3335 56L108 56C112.418 56 116 52.418 116 48.001L116 8.00049C116 3.58203 112.418 0 108 0L25.3335 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#323232"/>
-    </fill>
-  </Path>
-  <!-- shadow fill -->
-  <Path x="2" y="1.3335" winding="nonZero" data="M106 0C109.676 0 112.666 2.99121 112.666 6.66699L112.666 46.6675C112.666 50.3413 109.676 53.3335 106 53.3335L23.3784 53.3345C18.3945 53.3345 15.8164 47.8208 14.1416 46.1479 14.0869 46.0669 5.12305 34.1841 0 26.5215 5.12891 18.8438 14.1855 7.07715&#xD;&#xA; 14.2334 7.0083 17.2275 3.24561 19.3335 0 23.3335 0L106 0 106 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="56.3325" y="-1.04688" scaleX="54.1375" rotation="90">
-        <GradientEntry ratio="0" color="#FFFFFF" alpha="0.4"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- highlight border -->
-  <Path x="2" y="1.33252" winding="nonZero" data="M106 1.33252C108.94 1.33252 111.334 3.72412 111.334 6.6665L111.334 46.6665C111.334 49.6069 108.94 52.0015 106 52.0015L23.3784 52.0015C19.625 52.0015 15.0737 45.1274 15.0737 45.1274 11.7827 39.936 4.44189 30.7847 1.60254 26.5205 4.40576 22.3179&#xD;&#xA; 15.312 7.79346 15.312 7.79346 15.854 7.02002 19.6455 1.33252 23.3335 1.33252L106 1.33252ZM22.8955 0C19.167 0 16.417 4.26465 14.2334 7.00732 14.1855 7.07666 5.12891 18.8428 0 26.5205 5.12305 34.1846 14.0869 46.0669 14.1416 46.147 15.8164 47.8208&#xD;&#xA; 18.3945 53.3345 23.3784 53.3345L106 53.3345C109.676 53.3345 112.666 50.3423 112.666 46.6665L112.666 6.6665C112.666 2.99023 109.676 0 105.833 0L22.8955 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="56.3325" y="0" scaleX="53.335" rotation="90">
-        <GradientEntry ratio="0" alpha="0.35"/>
-        <GradientEntry ratio="0.662577" alpha="0.1"/>
-        <GradientEntry ratio="0.871166" color="#FFFFFF" alpha="0.05"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.2"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+	scaleGridLeft="26" scaleGridRight="108" scaleGridTop="10" scaleGridBottom="46">
+
+	<!-- invisible fix for scaling -->
+	<Rect x="0" y="0" width="116" height="56">
+		<fill>
+			<SolidColor color="#ffffff" alpha="0"/>
+		</fill>
+	</Rect>
+
+	<!-- border -->
+      <Path winding="nonZero" data="M108 1.3335C111.676 1.3335 114.666 4.32373 114.666 8.00049L114.666 48.001C114.666 51.6748 111.676 54.667 108 54.667L25.3784 54.668C20.3945 54.668 17.8164 49.1543 16.1416 47.4814 16.0869 47.4004 7.12305 35.5176 2 27.855 7.12891 20.1772 16.1855
+ 8.41064 16.2334 8.34082 19.2275 4.5791 21.084 1.3335 25.3335 1.3335L108 1.3335 108 1.3335ZM25.3335 0C19.8091 0 18.6865 2.55322 15.1445 7.57178 15.1445 7.57178 5.33301 19.9995 0 28 5.33301 36 15.0464 48.2393 15.0464 48.2393 19.0464 53.5732 20
+ 56 25.3335 56L108 56C112.418 56 116 52.418 116 48.001L116 8.00049C116 3.58203 112.418 0 108 0L25.3335 0Z">
+        <fill>
+          <SolidColor color="#323232"/>
+        </fill>
+      </Path>
+
+	<!-- shadow fill -->
+      <Path x="2" y="1.3335" winding="nonZero" data="M106 0C109.676 0 112.666 2.99121 112.666 6.66699L112.666 46.6675C112.666 50.3413 109.676 53.3335 106 53.3335L23.3784 53.3345C18.3945 53.3345 15.8164 47.8208 14.1416 46.1479 14.0869 46.0669 5.12305 34.1841 0 26.5215 5.12891 18.8438 14.1855 7.07715
+ 14.2334 7.0083 17.2275 3.24561 19.3335 0 23.3335 0L106 0 106 0Z">
+        <fill>
+          <LinearGradient x="56.3325" y="-1.04688" scaleX="54.1375" rotation="90">
+            <GradientEntry ratio="0" color="#FFFFFF" alpha="0.4"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+
+	<!-- highlight border -->
+      <Path x="2" y="1.33252" winding="nonZero" data="M106 1.33252C108.94 1.33252 111.334 3.72412 111.334 6.6665L111.334 46.6665C111.334 49.6069 108.94 52.0015 106 52.0015L23.3784 52.0015C19.625 52.0015 15.0737 45.1274 15.0737 45.1274 11.7827 39.936 4.44189 30.7847 1.60254 26.5205 4.40576 22.3179
+ 15.312 7.79346 15.312 7.79346 15.854 7.02002 19.6455 1.33252 23.3335 1.33252L106 1.33252ZM22.8955 0C19.167 0 16.417 4.26465 14.2334 7.00732 14.1855 7.07666 5.12891 18.8428 0 26.5205 5.12305 34.1846 14.0869 46.0669 14.1416 46.147 15.8164 47.8208
+ 18.3945 53.3345 23.3784 53.3345L106 53.3345C109.676 53.3345 112.666 50.3423 112.666 46.6665L112.666 6.6665C112.666 2.99023 109.676 0 105.833 0L22.8955 0Z">
+        <fill>
+          <LinearGradient x="56.3325" y="0" scaleX="53.335" rotation="90">
+            <GradientEntry ratio="0" alpha="0.35"/>
+            <GradientEntry ratio="0.662577" alpha="0.1"/>
+            <GradientEntry ratio="0.871166" color="#FFFFFF" alpha="0.05"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.2"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarFirstButton_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarFirstButton_down.fxg
index 1ccdc27..c2e73e8 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarFirstButton_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarFirstButton_down.fxg
@@ -18,32 +18,40 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="12" scaleGridTop="12" scaleGridRight="152" scaleGridBottom="78" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- shadow fill -->
-  <Path data="M160 80 10.7554 80C4.81641 80 0 75.1436 0 69.1533L0 10.8472C0 4.85693 4.81641 0 10.7554 0L160 0 160 80Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="79.9995" y="1.37939" scaleX="77.3718" rotation="90">
-        <GradientEntry ratio="0" alpha="0.14902"/>
-        <GradientEntry ratio="1" alpha="0.34902"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- border -->
-  <Path winding="nonZero" data="M158.655 1.35596 158.655 78.6445 10.7554 78.6445C5.56641 78.6445 1.34521 74.3857 1.34521 69.1533L1.34521 10.8472C1.34521 5.61377 5.56641 1.35596 10.7554 1.35596L158.655 1.35596ZM160 0 10.7554 0C4.81641 0 0 4.85693 0 10.8472L0 69.1533C0 75.1436&#xD;&#xA; 4.81641 80 10.7554 80L160 80 160 0 160 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#464646"/>
-    </fill>
-  </Path>
-  <!-- outer shadow -->
-  <Path x="1.3335" y="1.35986" winding="nonZero" data="M155.967 1.35547 155.967 75.9321 9.41113 75.9321C4.96338 75.9321 1.34473 72.2837 1.34473 67.7974L1.34473 9.49121C1.34473 5.00488 4.96338 1.35547 9.41113 1.35547L155.967 1.35547ZM157.311 0 9.41113 0C4.22119 0 0 4.25684 0 9.49121L0 67.7974C0 73.0308&#xD;&#xA; 4.22119 77.2886 9.41113 77.2886L157.311 77.2886 157.311 0 157.311 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor alpha="0.2"/>
-    </fill>
-  </Path>
-  <!-- inner shadow -->
-  <Path x="2.68896" y="2.71143" winding="nonZero" data="M153.299 1.3335 153.289 73.2427 8.06641 73.2427C4.35352 73.2427 1.33301 70.1919 1.33301 66.4419L1.33301 8.13574C1.33301 4.38477 4.35352 1.3335 8.06641 1.3335L153.299 1.3335ZM154.632 0 154.623 0 8.06641 0C3.61816 0 0 3.64941 0 8.13574L0 66.4419&#xD;&#xA;C0 70.9282 3.61816 74.5767 8.06641 74.5767L154.623 74.5767 154.632 0 154.632 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor alpha="0.1"/>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="12" scaleGridTop="12" scaleGridRight="152" scaleGridBottom="78">
+    
+      <!-- shadow fill -->
+      <Path data="M160 80 10.7554 80C4.81641 80 0 75.1436 0 69.1533L0 10.8472C0 4.85693 4.81641 0 10.7554 0L160 0 160 80Z">
+        <fill>
+          <LinearGradient x="79.9995" y="1.37939" scaleX="77.3718" rotation="90">
+            <GradientEntry ratio="0" alpha="0.14902"/>
+            <GradientEntry ratio="1" alpha="0.34902"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      
+      <!-- border -->
+      <Path winding="nonZero" data="M158.655 1.35596 158.655 78.6445 10.7554 78.6445C5.56641 78.6445 1.34521 74.3857 1.34521 69.1533L1.34521 10.8472C1.34521 5.61377 5.56641 1.35596 10.7554 1.35596L158.655 1.35596ZM160 0 10.7554 0C4.81641 0 0 4.85693 0 10.8472L0 69.1533C0 75.1436
+ 4.81641 80 10.7554 80L160 80 160 0 160 0Z">
+        <fill>
+          <SolidColor color="#464646"/>
+        </fill>
+      </Path>
+      
+      <!-- outer shadow -->
+      <Path x="1.3335" y="1.35986" winding="nonZero" data="M155.967 1.35547 155.967 75.9321 9.41113 75.9321C4.96338 75.9321 1.34473 72.2837 1.34473 67.7974L1.34473 9.49121C1.34473 5.00488 4.96338 1.35547 9.41113 1.35547L155.967 1.35547ZM157.311 0 9.41113 0C4.22119 0 0 4.25684 0 9.49121L0 67.7974C0 73.0308
+ 4.22119 77.2886 9.41113 77.2886L157.311 77.2886 157.311 0 157.311 0Z">
+        <fill>
+          <SolidColor alpha="0.2"/>
+        </fill>
+      </Path>
+      
+      <!-- inner shadow -->
+      <Path x="2.68896" y="2.71143" winding="nonZero" data="M153.299 1.3335 153.289 73.2427 8.06641 73.2427C4.35352 73.2427 1.33301 70.1919 1.33301 66.4419L1.33301 8.13574C1.33301 4.38477 4.35352 1.3335 8.06641 1.3335L153.299 1.3335ZM154.632 0 154.623 0 8.06641 0C3.61816 0 0 3.64941 0 8.13574L0 66.4419
+C0 70.9282 3.61816 74.5767 8.06641 74.5767L154.623 74.5767 154.632 0 154.632 0Z">
+        <fill>
+          <SolidColor alpha="0.1"/>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarFirstButton_selected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarFirstButton_selected.fxg
index 842b2d1..830c381 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarFirstButton_selected.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarFirstButton_selected.fxg
@@ -18,32 +18,40 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="12" scaleGridTop="12" scaleGridRight="152" scaleGridBottom="78" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- shadow fill -->
-  <Path data="M160 80 10.7554 80C4.81641 80 0 75.1436 0 69.1533L0 10.8462C0 4.85693 4.81641 0 10.7554 0L160 0 160 80Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="79.9995" y="1.37939" scaleX="77.3718" rotation="90">
-        <GradientEntry ratio="0" alpha="0.047059"/>
-        <GradientEntry ratio="1" alpha="0.247059"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- border -->
-  <Path winding="nonZero" data="M158.655 1.35693 158.655 78.6445 10.7554 78.6445C5.56641 78.6445 1.34521 74.3857 1.34521 69.1533L1.34521 10.8462C1.34521 5.61475 5.56641 1.35693 10.7554 1.35693L158.655 1.35693ZM160 0 10.7554 0C4.81641 0 0 4.85693 0 10.8462L0 69.1533C0 75.1436&#xD;&#xA; 4.81641 80 10.7554 80L160 80 160 0 160 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#646464"/>
-    </fill>
-  </Path>
-  <!-- outer shadow -->
-  <Path x="1.3335" y="1.35938" winding="nonZero" data="M155.967 1.35693 155.967 75.9326 9.41113 75.9326C4.96338 75.9326 1.34473 72.2842 1.34473 67.7979L1.34473 9.49219C1.34473 5.00537 4.96338 1.35693 9.41113 1.35693L155.967 1.35693ZM157.311 0 9.41113 0C4.22119 0 0 4.25781 0 9.49219L0 67.7979C0 73.0312&#xD;&#xA; 4.22119 77.2891 9.41113 77.2891L157.311 77.2891 157.311 0 157.311 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor alpha="0.2"/>
-    </fill>
-  </Path>
-  <!-- inner shadow -->
-  <Path x="2.68896" y="2.71094" winding="nonZero" data="M153.299 1.3335 153.289 73.2432 8.06641 73.2432C4.35352 73.2432 1.33301 70.1924 1.33301 66.4424L1.33301 8.13525C1.33301 4.38477 4.35352 1.3335 8.06641 1.3335L153.299 1.3335ZM154.632 0 8.06641 0C3.61816 0 0 3.6499 0 8.13525L0 66.4424C0 70.9287&#xD;&#xA; 3.61816 74.5771 8.06641 74.5771L154.623 74.5771 154.632 0 154.632 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor alpha="0.1"/>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="12" scaleGridTop="12" scaleGridRight="152" scaleGridBottom="78">
+    
+      <!-- shadow fill -->
+      <Path data="M160 80 10.7554 80C4.81641 80 0 75.1436 0 69.1533L0 10.8462C0 4.85693 4.81641 0 10.7554 0L160 0 160 80Z">
+        <fill>
+          <LinearGradient x="79.9995" y="1.37939" scaleX="77.3718" rotation="90">
+            <GradientEntry ratio="0" alpha="0.047059"/>
+            <GradientEntry ratio="1" alpha="0.247059"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      
+      <!-- border -->
+      <Path winding="nonZero" data="M158.655 1.35693 158.655 78.6445 10.7554 78.6445C5.56641 78.6445 1.34521 74.3857 1.34521 69.1533L1.34521 10.8462C1.34521 5.61475 5.56641 1.35693 10.7554 1.35693L158.655 1.35693ZM160 0 10.7554 0C4.81641 0 0 4.85693 0 10.8462L0 69.1533C0 75.1436
+ 4.81641 80 10.7554 80L160 80 160 0 160 0Z">
+        <fill>
+          <SolidColor color="#646464"/>
+        </fill>
+      </Path>
+      
+      <!-- outer shadow -->
+      <Path x="1.3335" y="1.35938" winding="nonZero" data="M155.967 1.35693 155.967 75.9326 9.41113 75.9326C4.96338 75.9326 1.34473 72.2842 1.34473 67.7979L1.34473 9.49219C1.34473 5.00537 4.96338 1.35693 9.41113 1.35693L155.967 1.35693ZM157.311 0 9.41113 0C4.22119 0 0 4.25781 0 9.49219L0 67.7979C0 73.0312
+ 4.22119 77.2891 9.41113 77.2891L157.311 77.2891 157.311 0 157.311 0Z">
+        <fill>
+          <SolidColor alpha="0.2"/>
+        </fill>
+      </Path>
+      
+      <!-- inner shadow -->
+      <Path x="2.68896" y="2.71094" winding="nonZero" data="M153.299 1.3335 153.289 73.2432 8.06641 73.2432C4.35352 73.2432 1.33301 70.1924 1.33301 66.4424L1.33301 8.13525C1.33301 4.38477 4.35352 1.3335 8.06641 1.3335L153.299 1.3335ZM154.632 0 8.06641 0C3.61816 0 0 3.6499 0 8.13525L0 66.4424C0 70.9287
+ 3.61816 74.5771 8.06641 74.5771L154.623 74.5771 154.632 0 154.632 0Z">
+        <fill>
+          <SolidColor alpha="0.1"/>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarFirstButton_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarFirstButton_up.fxg
index bc86f01..864eac3 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarFirstButton_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarFirstButton_up.fxg
@@ -18,26 +18,31 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="12" scaleGridTop="12" scaleGridRight="152" scaleGridBottom="78" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- highlight fill -->
-  <Path data="M160 80 10.5781 80C4.73682 80 0 75.3018 0 69.5078L0 10.4917C0 4.69727 4.73682 0 10.5781 0L160 0 160 80Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="79.9995" y="0.689453" scaleX="42.9587" rotation="90">
-        <GradientEntry ratio="0" color="#FFFFFF" alpha="0.698039"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.047059"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- border -->
-  <Path winding="nonZero" data="M158.677 1.31104 158.677 78.6885 10.5781 78.6885C5.4751 78.6885 1.32275 74.5703 1.32275 69.5078L1.32275 10.4917C1.32275 5.42969 5.4751 1.31104 10.5781 1.31104L158.677 1.31104ZM160 0 10.5781 0C4.73682 0 0 4.69727 0 10.4917L0 69.5078C0 75.3018 4.73682&#xD;&#xA; 80 10.5781 80L160 80 160 0 160 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#646464"/>
-    </fill>
-  </Path>
-  <!-- right separator highlight -->
-  <Rect x="157.333" y="1.3335" width="1.33398" height="77.3335" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#FFFFFF" alpha="0.2"/>
-    </fill>
-  </Rect>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="12" scaleGridTop="12" scaleGridRight="152" scaleGridBottom="78">
+    
+      <!-- highlight fill -->
+      <Path data="M160 80 10.5781 80C4.73682 80 0 75.3018 0 69.5078L0 10.4917C0 4.69727 4.73682 0 10.5781 0L160 0 160 80Z">
+        <fill>
+          <LinearGradient x="79.9995" y="0.689453" scaleX="42.9587" rotation="90">
+            <GradientEntry ratio="0" color="#FFFFFF" alpha="0.698039"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.047059"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      
+      <!-- border -->
+      <Path winding="nonZero" data="M158.677 1.31104 158.677 78.6885 10.5781 78.6885C5.4751 78.6885 1.32275 74.5703 1.32275 69.5078L1.32275 10.4917C1.32275 5.42969 5.4751 1.31104 10.5781 1.31104L158.677 1.31104ZM160 0 10.5781 0C4.73682 0 0 4.69727 0 10.4917L0 69.5078C0 75.3018 4.73682
+ 80 10.5781 80L160 80 160 0 160 0Z">
+        <fill>
+          <SolidColor color="#646464"/>
+        </fill>
+      </Path>
+      
+      <!-- right separator highlight -->
+      <Rect x="157.333" y="1.3335" width="1.33398" height="77.3335">
+        <fill>
+          <SolidColor color="#FFFFFF" alpha="0.2"/>
+        </fill>
+      </Rect>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarLastButton_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarLastButton_down.fxg
index 4c57038..8b303b8 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarLastButton_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarLastButton_down.fxg
@@ -18,32 +18,40 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="8" scaleGridTop="12" scaleGridRight="148" scaleGridBottom="68" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- shadow fill -->
-  <Path data="M0 0 149.245 0C155.184 0 160 4.85693 160 10.8472L160 69.1533C160 75.1436 155.184 80 149.245 80L0 80 0 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="79.9995" y="1.37939" scaleX="77.3705" rotation="90">
-        <GradientEntry ratio="0" alpha="0.14902"/>
-        <GradientEntry ratio="1" alpha="0.34902"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- outer shadow -->
-  <Path y="1.35986" winding="nonZero" data="M1.3335 1.35547 149.255 1.35547C153.703 1.35547 157.321 5.00488 157.321 9.49121L157.321 67.7974C157.321 72.2837 153.703 75.9321 149.255 75.9321L1.3335 75.9321M0 0 0 77.2886 149.255 77.2886C154.445 77.2886 158.667 73.0308 158.667 67.7974L158.667&#xD;&#xA; 9.49121C158.667 4.25684 154.445 0 149.255 0L0 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor alpha="0.2"/>
-    </fill>
-  </Path>
-  <!-- inner shadow -->
-  <Path x="1.3335" y="2.71143" winding="nonZero" data="M147.912 1.3335C151.624 1.3335 154.644 4.38477 154.644 8.13574L154.644 66.4419C154.644 70.1919 151.624 73.2427 147.912 73.2427L1.33301 73.2427 1.33301 1.3335 147.912 1.3335ZM147.912 0 0 0 0 74.5767 147.912 74.5767C152.359 74.5767 155.978 70.9282&#xD;&#xA; 155.978 66.4419L155.978 8.13574C155.978 3.64941 152.359 0 147.912 0L147.912 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor alpha="0.1"/>
-    </fill>
-  </Path>
-  <!-- border -->
-  <Path winding="nonZero" data="M149.422 0 0 0 0 1.31104 149.422 1.31104C154.524 1.31104 158.677 5.42969 158.677 10.4917L158.677 69.5078C158.677 74.5703 154.524 78.6885 149.422 78.6885L0 78.6885 0 80 149.422 80C155.263 80 160 75.3018 160 69.5078L160 10.4917C160 4.69727 155.263&#xD;&#xA; 0 149.422 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#464646"/>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="8" scaleGridTop="12" scaleGridRight="148" scaleGridBottom="68">
+    
+      <!-- shadow fill -->
+      <Path data="M0 0 149.245 0C155.184 0 160 4.85693 160 10.8472L160 69.1533C160 75.1436 155.184 80 149.245 80L0 80 0 0Z">
+        <fill>
+          <LinearGradient x="79.9995" y="1.37939" scaleX="77.3705" rotation="90">
+            <GradientEntry ratio="0" alpha="0.14902"/>
+            <GradientEntry ratio="1" alpha="0.34902"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      
+      <!-- outer shadow -->
+      <Path y="1.35986" winding="nonZero" data="M1.3335 1.35547 149.255 1.35547C153.703 1.35547 157.321 5.00488 157.321 9.49121L157.321 67.7974C157.321 72.2837 153.703 75.9321 149.255 75.9321L1.3335 75.9321M0 0 0 77.2886 149.255 77.2886C154.445 77.2886 158.667 73.0308 158.667 67.7974L158.667
+ 9.49121C158.667 4.25684 154.445 0 149.255 0L0 0Z">
+        <fill>
+          <SolidColor alpha="0.2"/>
+        </fill>
+      </Path>
+      
+      <!-- inner shadow -->
+      <Path x="1.3335" y="2.71143" winding="nonZero" data="M147.912 1.3335C151.624 1.3335 154.644 4.38477 154.644 8.13574L154.644 66.4419C154.644 70.1919 151.624 73.2427 147.912 73.2427L1.33301 73.2427 1.33301 1.3335 147.912 1.3335ZM147.912 0 0 0 0 74.5767 147.912 74.5767C152.359 74.5767 155.978 70.9282
+ 155.978 66.4419L155.978 8.13574C155.978 3.64941 152.359 0 147.912 0L147.912 0Z">
+        <fill>
+          <SolidColor alpha="0.1"/>
+        </fill>
+      </Path>
+      
+      <!-- border -->
+      <Path winding="nonZero" data="M149.422 0 0 0 0 1.31104 149.422 1.31104C154.524 1.31104 158.677 5.42969 158.677 10.4917L158.677 69.5078C158.677 74.5703 154.524 78.6885 149.422 78.6885L0 78.6885 0 80 149.422 80C155.263 80 160 75.3018 160 69.5078L160 10.4917C160 4.69727 155.263
+ 0 149.422 0Z">
+        <fill>
+          <SolidColor color="#464646"/>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarLastButton_selected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarLastButton_selected.fxg
index e53940c..61e486a 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarLastButton_selected.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarLastButton_selected.fxg
@@ -18,32 +18,40 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="8" scaleGridTop="12" scaleGridRight="148" scaleGridBottom="68" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- shadow fill -->
-  <Path data="M0 0 149.245 0C155.184 0 160 4.85693 160 10.8462L160 69.1533C160 75.1436 155.184 80 149.245 80L0 80 0 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="79.9995" y="1.37939" scaleX="77.3705" rotation="90">
-        <GradientEntry ratio="0" alpha="0.047059"/>
-        <GradientEntry ratio="1" alpha="0.247059"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- outer shadow -->
-  <Path y="1.35938" winding="nonZero" data="M1.34375 1.35693 149.255 1.35693C153.703 1.35693 157.321 5.00537 157.321 9.49219L157.321 67.7979C157.321 72.2842 153.703 75.9326 149.255 75.9326L1.34375 75.9326 1.34375 1.35693ZM0 77.2891 149.255 77.2891C154.445 77.2891 158.667 73.0312 158.667&#xD;&#xA; 67.7979L158.667 9.49219C158.667 4.25781 154.445 0 149.255 0L0 0 0 77.2891Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor alpha="0.2"/>
-    </fill>
-  </Path>
-  <!-- inner shadow -->
-  <Path x="1.32275" y="2.71094" winding="nonZero" data="M147.922 1.3335C151.634 1.3335 154.655 4.38477 154.655 8.13525L154.655 66.4424C154.655 70.1924 151.634 73.2432 147.922 73.2432L1.34375 73.2432 1.3335 1.3335 147.922 1.3335ZM147.922 0 0 0 0.0107422 74.5771 147.922 74.5771C152.37 74.5771 155.989&#xD;&#xA; 70.9287 155.989 66.4424L155.989 8.13525C155.989 3.6499 152.37 0 147.922 0L147.922 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor alpha="0.1"/>
-    </fill>
-  </Path>
-  <!-- border -->
-  <Path winding="nonZero" data="M149.422 0 0 0 0 1.31104 149.422 1.31104C154.524 1.31104 158.677 5.42969 158.677 10.4922L158.677 69.5078C158.677 74.5703 154.524 78.6885 149.422 78.6885L0 78.6885 0 80 149.422 80C155.263 80 160 75.3018 160 69.5078L160 10.4922C160 4.69775 155.263&#xD;&#xA; 0 149.422 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#646464"/>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="8" scaleGridTop="12" scaleGridRight="148" scaleGridBottom="68">
+    
+      <!-- shadow fill -->
+      <Path data="M0 0 149.245 0C155.184 0 160 4.85693 160 10.8462L160 69.1533C160 75.1436 155.184 80 149.245 80L0 80 0 0Z">
+        <fill>
+          <LinearGradient x="79.9995" y="1.37939" scaleX="77.3705" rotation="90">
+            <GradientEntry ratio="0" alpha="0.047059"/>
+            <GradientEntry ratio="1" alpha="0.247059"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      
+      <!-- outer shadow -->
+      <Path y="1.35938" winding="nonZero" data="M1.34375 1.35693 149.255 1.35693C153.703 1.35693 157.321 5.00537 157.321 9.49219L157.321 67.7979C157.321 72.2842 153.703 75.9326 149.255 75.9326L1.34375 75.9326 1.34375 1.35693ZM0 77.2891 149.255 77.2891C154.445 77.2891 158.667 73.0312 158.667
+ 67.7979L158.667 9.49219C158.667 4.25781 154.445 0 149.255 0L0 0 0 77.2891Z">
+        <fill>
+          <SolidColor alpha="0.2"/>
+        </fill>
+      </Path>
+      
+      <!-- inner shadow -->
+      <Path x="1.32275" y="2.71094" winding="nonZero" data="M147.922 1.3335C151.634 1.3335 154.655 4.38477 154.655 8.13525L154.655 66.4424C154.655 70.1924 151.634 73.2432 147.922 73.2432L1.34375 73.2432 1.3335 1.3335 147.922 1.3335ZM147.922 0 0 0 0.0107422 74.5771 147.922 74.5771C152.37 74.5771 155.989
+ 70.9287 155.989 66.4424L155.989 8.13525C155.989 3.6499 152.37 0 147.922 0L147.922 0Z">
+        <fill>
+          <SolidColor alpha="0.1"/>
+        </fill>
+      </Path>
+      
+      <!-- border -->
+      <Path winding="nonZero" data="M149.422 0 0 0 0 1.31104 149.422 1.31104C154.524 1.31104 158.677 5.42969 158.677 10.4922L158.677 69.5078C158.677 74.5703 154.524 78.6885 149.422 78.6885L0 78.6885 0 80 149.422 80C155.263 80 160 75.3018 160 69.5078L160 10.4922C160 4.69775 155.263
+ 0 149.422 0Z">
+        <fill>
+          <SolidColor color="#646464"/>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarLastButton_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarLastButton_up.fxg
index baf6123..7d77bc2 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarLastButton_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarLastButton_up.fxg
@@ -18,26 +18,31 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="8" scaleGridTop="12" scaleGridRight="148" scaleGridBottom="68" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- highlight fill -->
-  <Path data="M0 0 149.422 0C155.263 0 160 4.69727 160 10.4917L160 69.5078C160 75.3018 155.263 80 149.422 80L0 80 0 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="79.9995" y="0.689453" scaleX="42.9579" rotation="90">
-        <GradientEntry ratio="0" color="#FFFFFF" alpha="0.698039"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.047059"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- left separator highlight -->
-  <Rect y="1.3335" width="1.3335" height="77.3335" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#FFFFFF" alpha="0.2"/>
-    </fill>
-  </Rect>
-  <!-- border -->
-  <Path winding="nonZero" data="M149.422 0 0 0 0 1.31104 149.422 1.31104C154.524 1.31104 158.677 5.42969 158.677 10.4917L158.677 69.5078C158.677 74.5703 154.524 78.6885 149.422 78.6885L0 78.6885 0 80 149.422 80C155.263 80 160 75.3018 160 69.5078L160 10.4917C160 4.69727 155.263&#xD;&#xA; 0 149.422 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#646464"/>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="8" scaleGridTop="12" scaleGridRight="148" scaleGridBottom="68">
+    
+      <!-- highlight fill -->
+      <Path data="M0 0 149.422 0C155.263 0 160 4.69727 160 10.4917L160 69.5078C160 75.3018 155.263 80 149.422 80L0 80 0 0Z">
+        <fill>
+          <LinearGradient x="79.9995" y="0.689453" scaleX="42.9579" rotation="90">
+            <GradientEntry ratio="0" color="#FFFFFF" alpha="0.698039"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.047059"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      
+      <!-- left separator highlight -->
+      <Rect y="1.3335" width="1.3335" height="77.3335">
+        <fill>
+          <SolidColor color="#FFFFFF" alpha="0.2"/>
+        </fill>
+      </Rect>
+      
+      <!-- border -->
+      <Path winding="nonZero" data="M149.422 0 0 0 0 1.31104 149.422 1.31104C154.524 1.31104 158.677 5.42969 158.677 10.4917L158.677 69.5078C158.677 74.5703 154.524 78.6885 149.422 78.6885L0 78.6885 0 80 149.422 80C155.263 80 160 75.3018 160 69.5078L160 10.4917C160 4.69727 155.263
+ 0 149.422 0Z">
+        <fill>
+          <SolidColor color="#646464"/>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarMiddleButton_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarMiddleButton_down.fxg
index f41c20c..c6ace14 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarMiddleButton_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarMiddleButton_down.fxg
@@ -18,32 +18,37 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="8" scaleGridTop="8" scaleGridRight="152" scaleGridBottom="72" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- shadow fill -->
-  <Rect width="160" height="80" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="79.9995" y="1.37939" scaleX="77.3705" rotation="90">
-        <GradientEntry ratio="0" alpha="0.14902"/>
-        <GradientEntry ratio="1" alpha="0.34902"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- outer shadow -->
-  <Path y="1.3335" winding="nonZero" data="M1.3335 1.33301 157.333 1.33301 157.333 75.9995 1.3335 75.9995 1.3335 1.33301ZM0 0.0449219 0 77.3335 158.667 77.3335 158.667 0 0 0.0449219Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor alpha="0.2"/>
-    </fill>
-  </Path>
-  <!-- inner shadow -->
-  <Path x="1.3335" y="2.6665" winding="nonZero" data="M154.667 1.3335 154.667 73.3335 1.33301 73.3335 1.33301 1.3335 154.667 1.3335ZM156 0 0 0 0 74.6665 156 74.6665 156 0 156 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor alpha="0.1"/>
-    </fill>
-  </Path>
-  <!-- border -->
-  <Path winding="nonZero" data="M0 0 0 1.3335 158.667 1.3335 158.667 78.667 0 78.667 0 80 160 80 160 0 0 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#464646"/>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="8" scaleGridTop="8" scaleGridRight="152" scaleGridBottom="72">
+    
+      <!-- shadow fill -->
+      <Rect width="160" height="80">
+        <fill>
+          <LinearGradient x="79.9995" y="1.37939" scaleX="77.3705" rotation="90">
+            <GradientEntry ratio="0" alpha="0.14902"/>
+            <GradientEntry ratio="1" alpha="0.34902"/>
+          </LinearGradient>
+        </fill>
+      </Rect>
+      
+      <!-- outer shadow -->
+      <Path y="1.3335" winding="nonZero" data="M1.3335 1.33301 157.333 1.33301 157.333 75.9995 1.3335 75.9995 1.3335 1.33301ZM0 0.0449219 0 77.3335 158.667 77.3335 158.667 0 0 0.0449219Z">
+        <fill>
+          <SolidColor alpha="0.2"/>
+        </fill>
+      </Path>
+      
+      <!-- inner shadow -->
+      <Path x="1.3335" y="2.6665" winding="nonZero" data="M154.667 1.3335 154.667 73.3335 1.33301 73.3335 1.33301 1.3335 154.667 1.3335ZM156 0 0 0 0 74.6665 156 74.6665 156 0 156 0Z">
+        <fill>
+          <SolidColor alpha="0.1"/>
+        </fill>
+      </Path>
+      
+      <!-- border -->
+      <Path winding="nonZero" data="M0 0 0 1.3335 158.667 1.3335 158.667 78.667 0 78.667 0 80 160 80 160 0 0 0Z">
+        <fill>
+          <SolidColor color="#464646"/>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarMiddleButton_selected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarMiddleButton_selected.fxg
index 65d0358..aad6c68 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarMiddleButton_selected.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarMiddleButton_selected.fxg
@@ -18,32 +18,37 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="8" scaleGridTop="8" scaleGridRight="152" scaleGridBottom="72" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- shadow fill -->
-  <Rect y="1.3335" width="158.667" height="77.3335" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="79.3335" y="1.3335" scaleX="74.7917" rotation="90">
-        <GradientEntry ratio="0" alpha="0.047059"/>
-        <GradientEntry ratio="1" alpha="0.247059"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- outer shadow -->
-  <Path y="1.3335" winding="nonZero" data="M1.3335 1.33301 157.333 1.33301 157.333 75.9995 1.3335 75.9995 1.3335 1.33301ZM0 0.0439453 0 77.3335 158.667 77.3335 158.667 0 0 0.0439453 0 0.0439453Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor alpha="0.2"/>
-    </fill>
-  </Path>
-  <!-- inner shadow -->
-  <Path x="1.32275" y="2.6665" winding="nonZero" data="M154.677 1.3335 154.677 73.3335 1.34375 73.3335 1.3335 1.3335 154.677 1.3335ZM156.01 0 0 0 0.0107422 74.6665 156.01 74.6665 156.01 0 156.01 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor alpha="0.1"/>
-    </fill>
-  </Path>
-  <!-- border -->
-  <Path winding="nonZero" data="M0 0 0 1.3335 158.667 1.3335 158.667 78.667 0 78.667 0 80 160 80 160 0 0 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#646464"/>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="8" scaleGridTop="8" scaleGridRight="152" scaleGridBottom="72">
+    
+      <!-- shadow fill -->
+      <Rect y="1.3335" width="158.667" height="77.3335">
+        <fill>
+          <LinearGradient x="79.3335" y="1.3335" scaleX="74.7917" rotation="90">
+            <GradientEntry ratio="0" alpha="0.047059"/>
+            <GradientEntry ratio="1" alpha="0.247059"/>
+          </LinearGradient>
+        </fill>
+      </Rect>
+      
+      <!-- outer shadow -->
+      <Path y="1.3335" winding="nonZero" data="M1.3335 1.33301 157.333 1.33301 157.333 75.9995 1.3335 75.9995 1.3335 1.33301ZM0 0.0439453 0 77.3335 158.667 77.3335 158.667 0 0 0.0439453 0 0.0439453Z">
+        <fill>
+          <SolidColor alpha="0.2"/>
+        </fill>
+      </Path>
+      
+      <!-- inner shadow -->
+      <Path x="1.32275" y="2.6665" winding="nonZero" data="M154.677 1.3335 154.677 73.3335 1.34375 73.3335 1.3335 1.3335 154.677 1.3335ZM156.01 0 0 0 0.0107422 74.6665 156.01 74.6665 156.01 0 156.01 0Z">
+        <fill>
+          <SolidColor alpha="0.1"/>
+        </fill>
+      </Path>
+      
+      <!-- border -->
+      <Path winding="nonZero" data="M0 0 0 1.3335 158.667 1.3335 158.667 78.667 0 78.667 0 80 160 80 160 0 0 0Z">
+        <fill>
+          <SolidColor color="#646464"/>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarMiddleButton_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarMiddleButton_up.fxg
index 8da7c87..840b767 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarMiddleButton_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ButtonBarMiddleButton_up.fxg
@@ -18,32 +18,37 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="8" scaleGridTop="8" scaleGridRight="152" scaleGridBottom="72" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- highlight fill -->
-  <Rect width="160" height="80" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="79.9995" y="0.689453" scaleX="42.9579" rotation="90">
-        <GradientEntry ratio="0" color="#FFFFFF" alpha="0.698039"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.047059"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- border -->
-  <Path winding="nonZero" data="M0 0 0 1.3335 158.667 1.3335 158.667 78.667 0 78.667 0 80 160 80 160 0 0 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#646464"/>
-    </fill>
-  </Path>
-  <!-- left separator highlight -->
-  <Rect y="1.3335" width="1.3335" height="77.3335" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#FFFFFF" alpha="0.2"/>
-    </fill>
-  </Rect>
-  <!-- right separator highlight -->
-  <Rect x="157.333" y="1.3335" width="1.33398" height="77.3335" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#FFFFFF" alpha="0.2"/>
-    </fill>
-  </Rect>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="8" scaleGridTop="8" scaleGridRight="152" scaleGridBottom="72">
+    
+      <!-- highlight fill -->
+      <Rect width="160" height="80">
+        <fill>
+          <LinearGradient x="79.9995" y="0.689453" scaleX="42.9579" rotation="90">
+            <GradientEntry ratio="0" color="#FFFFFF" alpha="0.698039"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.047059"/>
+          </LinearGradient>
+        </fill>
+      </Rect>
+      
+      <!-- border -->
+      <Path winding="nonZero" data="M0 0 0 1.3335 158.667 1.3335 158.667 78.667 0 78.667 0 80 160 80 160 0 0 0Z">
+        <fill>
+          <SolidColor color="#646464"/>
+        </fill>
+      </Path>
+      
+      <!-- left separator highlight -->
+      <Rect y="1.3335" width="1.3335" height="77.3335">
+        <fill>
+          <SolidColor color="#FFFFFF" alpha="0.2"/>
+        </fill>
+      </Rect>
+      
+      <!-- right separator highlight -->
+      <Rect x="157.333" y="1.3335" width="1.33398" height="77.3335">
+        <fill>
+          <SolidColor color="#FFFFFF" alpha="0.2"/>
+        </fill>
+      </Rect>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/Button_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/Button_down.fxg
index f372c21..1d079c2 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/Button_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/Button_down.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,32 +18,34 @@
 
 -->
 
-<Graphic version="2.0" viewHeight="86" viewWidth="292" scaleGridLeft="20" scaleGridRight="272" scaleGridTop="20" scaleGridBottom="66" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- Border -->
-  <Path data="M12 2 280 2C286 2 290 6 290 12L290 74C290 80 286 84 280 84L12 84C6 84 2 80 2 74L2 12C2 6 6 2 12 2ZM12 0C6 0 0 6 0 12L0 74C0 80 6 86 12 86L280 86C286 86 292 80 292 74L292 12C292 6 286 0 280 0L12 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#464646"/>
-    </fill>
-  </Path>
-  <!-- Fill Shadow -->
-  <Path x="2" y="2" data="M10 0 278 0C284 0 288 4 288 10L288 72C288 78 284 82 278 82L10 82C4 82 0 78 0 72L0 10C0 4 4 0 10 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="144" y="0" scaleX="82.0005" rotation="90">
-        <GradientEntry ratio="0" alpha="0.05"/>
-        <GradientEntry ratio="1" alpha="0.25"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- Inner Shadow -->
-  <Path x="2" y="2" data="M2 10C2 6 6 2 10 2L278 2C282 2 286 6 286 10L286 72C286 76 282 80 278 80L10 80C6 80 2 76 2 72L2 10ZM10 0C4 0 0 4 0 10L0 72C0 78 4 82 10 82L278 82C284 82 288 78 288 72L288 10C288 4 284 0 278 0L10 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor alpha="0.2"/>
-    </fill>
-  </Path>
-  <!-- Inner Inner Shadow -->
-  <Path x="4" y="4" data="M2 8C2 4 4 2 8 2L276 2C280 2 282 4 282 8L282 70C282 74 280 76 276 76L8 76C4 76 2 74 2 70L2 8ZM0 8 0 70C0 74 4 78 8 78L276 78C280 78 284 74 284 70L284 8C284 4 280 0 276 0L8 0C4 0 0 4 0 8Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#646464" alpha="0.1"/>
-    </fill>
-  </Path>
+
+<Graphic version="2.0" viewHeight="86" viewWidth="292" xmlns="http://ns.adobe.com/fxg/2008"
+	scaleGridLeft="20" scaleGridRight="272" scaleGridTop="20" scaleGridBottom="66">
+  	<!-- Border --> 
+	<Path data="M12 2 280 2C286 2 290 6 290 12L290 74C290 80 286 84 280 84L12 84C6 84 2 80 2 74L2 12C2 6 6 2 12 2ZM12 0C6 0 0 6 0 12L0 74C0 80 6 86 12 86L280 86C286 86 292 80 292 74L292 12C292 6 286 0 280 0L12 0Z">
+    	<fill>
+      		<SolidColor color="#464646"/>
+    	</fill>
+  	</Path>
+	<!-- Fill Shadow -->
+  	<Path x="2" y="2" data="M10 0 278 0C284 0 288 4 288 10L288 72C288 78 284 82 278 82L10 82C4 82 0 78 0 72L0 10C0 4 4 0 10 0Z">
+	    <fill>
+      		<LinearGradient x="144" y="0" scaleX="82.0005" rotation="90">
+        		<GradientEntry ratio="0" alpha="0.05"/>
+        		<GradientEntry ratio="1" alpha="0.25"/>
+      		</LinearGradient>
+    	</fill>
+  	</Path>
+  	<!-- Inner Shadow -->
+	<Path x="2" y="2" data="M2 10C2 6 6 2 10 2L278 2C282 2 286 6 286 10L286 72C286 76 282 80 278 80L10 80C6 80 2 76 2 72L2 10ZM10 0C4 0 0 4 0 10L0 72C0 78 4 82 10 82L278 82C284 82 288 78 288 72L288 10C288 4 284 0 278 0L10 0Z">
+	    <fill>
+      		<SolidColor alpha="0.2"/>
+    	</fill>
+  	</Path>
+  	<!-- Inner Inner Shadow -->
+	<Path x="4" y="4" data="M2 8C2 4 4 2 8 2L276 2C280 2 282 4 282 8L282 70C282 74 280 76 276 76L8 76C4 76 2 74 2 70L2 8ZM0 8 0 70C0 74 4 78 8 78L276 78C280 78 284 74 284 70L284 8C284 4 280 0 276 0L8 0C4 0 0 4 0 8Z">
+	    <fill>
+      		<SolidColor color="#646464" alpha="0.1"/>
+    	</fill>
+  	</Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/Button_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/Button_up.fxg
index c4a3d4d..3c917e1 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/Button_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/Button_up.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,11 +18,12 @@
 
 -->
 
-<Graphic version="2.0" viewHeight="86" viewWidth="292" scaleGridLeft="20" scaleGridRight="272" scaleGridTop="20" scaleGridBottom="66" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- Outer Border -->
-  <Path data="M12 2 280 2C286 2 290 6 290 12L290 74C290 80 286 84 280 84L12 84C6 84 2 80 2 74L2 12C2 6 6 2 12 2ZM12 0C6 0 0 6 0 12L0 74C0 80 6 86 12 86L280 86C286 86 292 80 292 74L292 12C292 6 286 0 280 0L12 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#646464"/>
-    </fill>
-  </Path>
+
+<Graphic version="2.0" viewHeight="86" viewWidth="292" xmlns="http://ns.adobe.com/fxg/2008" scaleGridLeft="20" scaleGridRight="272" scaleGridTop="20" scaleGridBottom="66">
+	<!-- Outer Border -->
+	<Path data="M12 2 280 2C286 2 290 6 290 12L290 74C290 80 286 84 280 84L12 84C6 84 2 80 2 74L2 12C2 6 6 2 12 2ZM12 0C6 0 0 6 0 12L0 74C0 80 6 86 12 86L280 86C286 86 292 80 292 74L292 12C292 6 286 0 280 0L12 0Z">
+    	<fill>
+    	  	<SolidColor color="#646464"/>
+    	</fill>
+  	</Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/CalloutContentBackground.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/CalloutContentBackground.fxg
index e7ea95f..8442b96 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/CalloutContentBackground.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/CalloutContentBackground.fxg
@@ -18,26 +18,34 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="12" scaleGridRight="588" scaleGridTop="30" scaleGridBottom="388" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="399" width="600" height="1" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- Content Shading Top -->
-  <Rect x="0" y="0" width="600" height="20" topLeftRadiusX="10" topLeftRadiusY="10" topRightRadiusX="10" topRightRadiusY="10" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient rotation="90">
-        <GradientEntry ratio="0" color="#000000" alpha="0.6"/>
-        <GradientEntry ratio="0.5" color="#000000" alpha="0"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- Content Highlight -->
-  <Rect x="1" y="1" width="598" height="398" radiusX="10" radiusY="10" scaleX="1.5" scaleY="1.5">
-    <stroke>
-      <SolidColorStroke color="#FFFFFF" alpha="0.8" weight="2"/>
-    </stroke>
-  </Rect>
-</Graphic>
\ No newline at end of file
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+	scaleGridLeft="12" scaleGridRight="588" scaleGridTop="30" scaleGridBottom="388">
+
+	<!-- invisible fix for scaling -->
+	<Rect x="0" y="399" width="600" height="1">
+		<fill>
+			<SolidColor color="#ffffff" alpha="0"/>
+		</fill>
+	</Rect>
+    
+	<!-- Content Shading Top -->
+	<Rect x="0" y="0" width="600" height="20"
+			topLeftRadiusX="10" topLeftRadiusY="10"
+			topRightRadiusX="10" topRightRadiusY="10">
+		<fill>
+			<LinearGradient  rotation="90">
+				<GradientEntry ratio="0" color="#000000" alpha="0.6"/>
+				<GradientEntry ratio="0.5" color="#000000" alpha="0"/>
+			</LinearGradient>
+		</fill>
+	</Rect>
+		
+	<!-- Content Highlight -->
+	<Rect x="1" y="1" width="598" height="398"
+			radiusX="10" radiusY="10">
+		<stroke>
+			<SolidColorStroke color="#FFFFFF" alpha="0.8"
+								weight="2"/>
+		</stroke>
+	</Rect>
+</Graphic>
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/CheckBox_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/CheckBox_down.fxg
index 0a5488e..7a2c8a6 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/CheckBox_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/CheckBox_down.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,49 +18,50 @@
 
 -->
 
+
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Rect x="4" y="62" alpha="0.08" width="56" height="2" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#FFFFFF"/>
-    </fill>
-  </Rect>
-  <Path x="4" y="4" data="M0 4C0 2 2 0 4 0L52 0C54 0 56 2 56 4L56 52C56 54 56 56 54 56L2 56C0 56 0 54 0 52L0 4Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="28" y="0" scaleX="56.0005" rotation="90">
-        <GradientEntry ratio="0" alpha="0.1"/>
-        <GradientEntry ratio="1" alpha="0.4"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path x="4" y="4" data="M2 6C2 4 4 2 6 2L50 2C52 2 54 4 54 6L54 50C54 52 54 54 52 54L4 54C2 54 2 52 2 50L2 6ZM0 4 0 52C0 54 0 56 2 56L54 56C56 56 56 54 56 52L56 4C56 2 54 0 52 0L4 0C2 0 0 2 0 4Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="28" y="0" scaleX="56" rotation="90">
-        <GradientEntry ratio="0" alpha="0.25"/>
-        <GradientEntry ratio="1" alpha="0.05"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path x="6" y="6" data="M2 6C2 4 4 2 6 2L46 2C48 2 50 4 50 6L50 46C50 48 50 50 48 50L4 50C2 50 2 48 2 46L2 6ZM0 4 0 48C0 50 0 52 2 52L50 52C52 52 52 50 52 48L52 4C52 2 50 0 48 0L4 0C2 0 0 2 0 4Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="26" y="0" scaleX="52" rotation="90">
-        <GradientEntry ratio="0" alpha="0.1"/>
-        <GradientEntry ratio="1" alpha="0"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path x="2" y="2" alpha="0.7" data="M2 6C2 4 4 2 6 2L54 2C56 2 58 4 58 6L58 54C58 56 58 58 56 58L4 58C2 58 2 56 2 54L2 6ZM0 4 0 56C0 58 2 60 4 60L56 60C58 60 60 58 60 56L60 4C60 2 58 0 56 0L4 0C2 0 0 4 0 4Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor/>
-    </fill>
-  </Path>
-  <Path alpha="0.06" data="M2 6C2 4 4 2 6 2L58 2C60 2 62 4 62 6L62 58C62 60 62 62 60 62L4 62C2 62 2 60 2 58L2 6ZM0 4 0 60C0 62 2 64 4 64L60 64C62 64 64 62 64 60L64 4C64 2 62 0 60 0L4 0C2 0 0 4 0 4Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#FFFFFF"/>
-    </fill>
-  </Path>
-  <Rect x="4" y="62" alpha="0.1" width="56" height="2" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#FFFFFF"/>
-    </fill>
-  </Rect>
+      <Rect x="4" y="62" alpha="0.08" width="56" height="2">
+        <fill>
+          <SolidColor color="#FFFFFF"/>
+        </fill>
+      </Rect>
+      <Path x="4" y="4" data="M0 4C0 2 2 0 4 0L52 0C54 0 56 2 56 4L56 52C56 54 56 56 54 56L2 56C0 56 0 54 0 52L0 4Z">
+        <fill>
+          <LinearGradient x="28" y="0" scaleX="56.0005" rotation="90">
+            <GradientEntry ratio="0" alpha="0.1"/>
+            <GradientEntry ratio="1" alpha="0.4"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      <Path x="4" y="4" data="M2 6C2 4 4 2 6 2L50 2C52 2 54 4 54 6L54 50C54 52 54 54 52 54L4 54C2 54 2 52 2 50L2 6ZM0 4 0 52C0 54 0 56 2 56L54 56C56 56 56 54 56 52L56 4C56 2 54 0 52 0L4 0C2 0 0 2 0 4Z">
+        <fill>
+          <LinearGradient x="28" y="0" scaleX="56" rotation="90">
+            <GradientEntry ratio="0" alpha="0.25"/>
+            <GradientEntry ratio="1" alpha="0.05"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      <Path x="6" y="6" data="M2 6C2 4 4 2 6 2L46 2C48 2 50 4 50 6L50 46C50 48 50 50 48 50L4 50C2 50 2 48 2 46L2 6ZM0 4 0 48C0 50 0 52 2 52L50 52C52 52 52 50 52 48L52 4C52 2 50 0 48 0L4 0C2 0 0 2 0 4Z">
+        <fill>
+          <LinearGradient x="26" y="0" scaleX="52" rotation="90">
+            <GradientEntry ratio="0" alpha="0.1"/>
+            <GradientEntry ratio="1" alpha="0"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      <Path x="2" y="2" alpha="0.7" data="M2 6C2 4 4 2 6 2L54 2C56 2 58 4 58 6L58 54C58 56 58 58 56 58L4 58C2 58 2 56 2 54L2 6ZM0 4 0 56C0 58 2 60 4 60L56 60C58 60 60 58 60 56L60 4C60 2 58 0 56 0L4 0C2 0 0 4 0 4Z">
+        <fill>
+          <SolidColor/>
+        </fill>
+      </Path>
+      <Path alpha="0.06" data="M2 6C2 4 4 2 6 2L58 2C60 2 62 4 62 6L62 58C62 60 62 62 60 62L4 62C2 62 2 60 2 58L2 6ZM0 4 0 60C0 62 2 64 4 64L60 64C62 64 64 62 64 60L64 4C64 2 62 0 60 0L4 0C2 0 0 4 0 4Z">
+        <fill>
+          <SolidColor color="#FFFFFF"/>
+        </fill>
+      </Path>
+      <Rect x="4" y="62" alpha="0.1" width="56" height="2">
+        <fill>
+          <SolidColor color="#FFFFFF"/>
+        </fill>
+      </Rect>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/CheckBox_downSymbol.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/CheckBox_downSymbol.fxg
index 8cbbd08..cfe76bf 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/CheckBox_downSymbol.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/CheckBox_downSymbol.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,23 +18,24 @@
 
 -->
 
+
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path x="4" y="10" data="M0 22 10 12 22 24 46 0 56 10 22 44 0 22Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="28" y="4" scaleX="44.0005" rotation="90">
-        <GradientEntry ratio="0" color="#999999"/>
-        <GradientEntry ratio="1" color="#B4B4B4"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path x="4" y="10" alpha="0.6" data="M0 22 10 12 22 24 46 0 56 10" scaleX="1.5" scaleY="1.5">
-    <stroke>
-      <SolidColorStroke weight="1" joints="bevel"/>
-    </stroke>
-  </Path>
-  <Path x="4" y="20" alpha="0.3" data="M0 12 22 34 56 0" scaleX="1.5" scaleY="1.5">
-    <stroke>
-      <SolidColorStroke weight="1" joints="bevel" color="#FFFFFF"/>
-    </stroke>
-  </Path>
+      <Path x="4" y="10" data="M0 22 10 12 22 24 46 0 56 10 22 44 0 22Z">
+        <fill>
+          <LinearGradient x="28" y="4" scaleX="44.0005" rotation="90">
+            <GradientEntry ratio="0" color="#999999"/>
+            <GradientEntry ratio="1" color="#B4B4B4"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      <Path x="4" y="10" alpha="0.6" data="M0 22 10 12 22 24 46 0 56 10">
+        <stroke>
+          <SolidColorStroke weight="1" joints="bevel"/>
+        </stroke>
+      </Path>
+      <Path x="4" y="20" alpha="0.3" data="M0 12 22 34 56 0">
+        <stroke>
+          <SolidColorStroke weight="1" joints="bevel" color="#FFFFFF"/>
+        </stroke>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/CheckBox_downSymbolSelected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/CheckBox_downSymbolSelected.fxg
index d0e3db9..d6843cc 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/CheckBox_downSymbolSelected.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/CheckBox_downSymbolSelected.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,23 +18,24 @@
 
 -->
 
+
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path x="4" y="10" data="M0 22 10 12 22 24 46 0 56 10 22 44 0 22Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="28" y="24" scaleX="48" rotation="90">
-        <GradientEntry ratio="0" color="#5A5A5A"/>
-        <GradientEntry ratio="1" color="#323232"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path x="4" y="10" alpha="0.25" data="M0 22 10 12 22 24 46 0 56 10" scaleX="1.5" scaleY="1.5">
-    <stroke>
-      <SolidColorStroke weight="1" joints="bevel" color="#FFFFFF"/>
-    </stroke>
-  </Path>
-  <Path x="4" y="20" alpha="0.7" data="M0 12 22 34 56 0" scaleX="1.5" scaleY="1.5">
-    <stroke>
-      <SolidColorStroke weight="1" joints="bevel"/>
-    </stroke>
-  </Path>
-</Graphic>
\ No newline at end of file
+      <Path x="4" y="10" data="M0 22 10 12 22 24 46 0 56 10 22 44 0 22Z">
+        <fill>
+          <LinearGradient x="28" y="24" scaleX="48" rotation="90">
+            <GradientEntry ratio="0" color="#5A5A5A"/>
+            <GradientEntry ratio="1" color="#323232"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      <Path x="4" y="10" alpha="0.25" data="M0 22 10 12 22 24 46 0 56 10">
+        <stroke>
+          <SolidColorStroke weight="1" joints="bevel" color="#FFFFFF"/>
+        </stroke>
+      </Path>
+      <Path x="4" y="20" alpha="0.7" data="M0 12 22 34 56 0">
+        <stroke>
+          <SolidColorStroke weight="1" joints="bevel"/>
+        </stroke>
+      </Path>
+  </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/CheckBox_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/CheckBox_up.fxg
index e835064..716997d 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/CheckBox_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/CheckBox_up.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,8 +18,9 @@
 
 -->
 
+
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path x="4" y="4" data="M0 4C0 2 2 0 4 0L52 0C54 0 56 2 56 4L56 52C56 54 56 56 54 56L2 56C0 56 0 54 0 52L0 4Z" scaleX="1.5" scaleY="1.5">
+  <Path x="4" y="4" data="M0 4C0 2 2 0 4 0L52 0C54 0 56 2 56 4L56 52C56 54 56 56 54 56L2 56C0 56 0 54 0 52L0 4Z">
     <fill>
       <LinearGradient x="28" y="8" scaleX="40.0004" rotation="90">
         <GradientEntry ratio="0" color="#FFFFFF" alpha="0.8"/>
@@ -27,7 +28,7 @@
       </LinearGradient>
     </fill>
   </Path>
-  <Path x="4" y="4" data="M2 6C2 4 4 2 6 2L50 2C52 2 54 4 54 6L54 50C54 52 54 54 52 54L4 54C2 54 2 52 2 50L2 6ZM0 4 0 52C0 54 0 56 2 56L54 56C56 56 56 54 56 52L56 4C56 2 54 0 52 0L4 0C2 0 0 2 0 4Z" scaleX="1.5" scaleY="1.5">
+  <Path x="4" y="4" data="M2 6C2 4 4 2 6 2L50 2C52 2 54 4 54 6L54 50C54 52 54 54 52 54L4 54C2 54 2 52 2 50L2 6ZM0 4 0 52C0 54 0 56 2 56L54 56C56 56 56 54 56 52L56 4C56 2 54 0 52 0L4 0C2 0 0 2 0 4Z">
     <fill>
       <LinearGradient x="28" y="0" scaleX="56.0005" rotation="90">
         <GradientEntry ratio="0" color="#FFFFFF" alpha="0.35"/>
@@ -35,22 +36,22 @@
       </LinearGradient>
     </fill>
   </Path>
-  <Path x="2" y="2" alpha="0.6" data="M2 6C2 4 4 2 6 2L54 2C56 2 58 4 58 6L58 54C58 56 58 58 56 58L4 58C2 58 2 56 2 54L2 6ZM0 4 0 56C0 58 2 60 4 60L56 60C58 60 60 58 60 56L60 4C60 2 58 0 56 0L4 0C2 0 0 4 0 4Z" scaleX="1.5" scaleY="1.5">
+  <Path x="2" y="2" alpha="0.6" data="M2 6C2 4 4 2 6 2L54 2C56 2 58 4 58 6L58 54C58 56 58 58 56 58L4 58C2 58 2 56 2 54L2 6ZM0 4 0 56C0 58 2 60 4 60L56 60C58 60 60 58 60 56L60 4C60 2 58 0 56 0L4 0C2 0 0 4 0 4Z">
     <fill>
       <SolidColor/>
     </fill>
   </Path>
-  <Path alpha="0.06" data="M2 6C2 4 4 2 6 2L58 2C60 2 62 4 62 6L62 58C62 60 62 62 60 62L4 62C2 62 2 60 2 58L2 6ZM0 4 0 60C0 62 2 64 4 64L60 64C62 64 64 62 64 60L64 4C64 2 62 0 60 0L4 0C2 0 0 4 0 4Z" scaleX="1.5" scaleY="1.5">
+  <Path alpha="0.06" data="M2 6C2 4 4 2 6 2L58 2C60 2 62 4 62 6L62 58C62 60 62 62 60 62L4 62C2 62 2 60 2 58L2 6ZM0 4 0 60C0 62 2 64 4 64L60 64C62 64 64 62 64 60L64 4C64 2 62 0 60 0L4 0C2 0 0 4 0 4Z">
     <fill>
       <SolidColor/>
     </fill>
   </Path>
-  <Rect x="6" y="4" alpha="0.15" width="52" height="2" scaleX="1.5" scaleY="1.5">
+  <Rect x="6" y="4" alpha="0.15" width="52" height="2">
     <fill>
       <SolidColor color="#FFFFFF"/>
     </fill>
   </Rect>
-  <Rect x="4" y="62" alpha="0.1" width="56" height="2" scaleX="1.5" scaleY="1.5">
+  <Rect x="4" y="62" alpha="0.1" width="56" height="2">
     <fill>
       <SolidColor/>
     </fill>
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/CheckBox_upSymbol.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/CheckBox_upSymbol.fxg
index acaea44..29219e0 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/CheckBox_upSymbol.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/CheckBox_upSymbol.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,23 +18,24 @@
 
 -->
 
+
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path x="4" y="10" data="M0 22 10 12 22 24 46 0 56 10 22 44 0 22Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="28" y="24" scaleX="48" rotation="90">
-        <GradientEntry ratio="0" color="#C8C8C8"/>
-        <GradientEntry ratio="1" color="#E1E1E1"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path x="4" y="10" alpha="0.5" data="M0 22 10 12 22 24 46 0 56 10" scaleX="1.5" scaleY="1.5">
-    <stroke>
-      <SolidColorStroke weight="1" joints="bevel"/>
-    </stroke>
-  </Path>
-  <Path x="4" y="20" alpha="0.5" data="M0 12 22 34 56 0" scaleX="1.5" scaleY="1.5">
-    <stroke>
-      <SolidColorStroke weight="1" joints="bevel" color="#FFFFFF"/>
-    </stroke>
-  </Path>
+      <Path x="4" y="10" data="M0 22 10 12 22 24 46 0 56 10 22 44 0 22Z">
+        <fill>
+          <LinearGradient x="28" y="24" scaleX="48" rotation="90">
+            <GradientEntry ratio="0" color="#C8C8C8"/>
+            <GradientEntry ratio="1" color="#E1E1E1"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      <Path x="4" y="10" alpha="0.5" data="M0 22 10 12 22 24 46 0 56 10">
+        <stroke>
+          <SolidColorStroke weight="1" joints="bevel"/>
+        </stroke>
+      </Path>
+      <Path x="4" y="20" alpha="0.5" data="M0 12 22 34 56 0">
+        <stroke>
+          <SolidColorStroke weight="1" joints="bevel" color="#FFFFFF"/>
+        </stroke>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/CheckBox_upSymbolSelected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/CheckBox_upSymbolSelected.fxg
index 12eb7d0..51566c6 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/CheckBox_upSymbolSelected.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/CheckBox_upSymbolSelected.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,23 +18,24 @@
 
 -->
 
+
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path x="4" y="10" data="M0 22 10 12 22 24 46 0 56 10 22 44 0 22Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="28" y="12" scaleX="32" rotation="90">
-        <GradientEntry ratio="0" color="#5A5A5A"/>
-        <GradientEntry ratio="1" color="#323232"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path x="4" y="10" alpha="0.7" data="M0 22 10 12 22 24 46 0 56 10" scaleX="1.5" scaleY="1.5">
-    <stroke>
-      <SolidColorStroke weight="1" joints="bevel" color="#FFFFFF"/>
-    </stroke>
-  </Path>
-  <Path x="4" y="20" data="M0 12 22 34 56 0" scaleX="1.5" scaleY="1.5">
-    <stroke>
-      <SolidColorStroke weight="1" joints="bevel"/>
-    </stroke>
-  </Path>
+      <Path x="4" y="10" data="M0 22 10 12 22 24 46 0 56 10 22 44 0 22Z">
+        <fill>
+          <LinearGradient x="28" y="12" scaleX="32" rotation="90">
+            <GradientEntry ratio="0" color="#5A5A5A"/>
+            <GradientEntry ratio="1" color="#323232"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      <Path x="4" y="10" alpha="0.7" data="M0 22 10 12 22 24 46 0 56 10">
+        <stroke>
+          <SolidColorStroke weight="1" joints="bevel" color="#FFFFFF"/>
+        </stroke>
+      </Path>
+      <Path x="4" y="20" data="M0 12 22 34 56 0">
+        <stroke>
+          <SolidColorStroke weight="1" joints="bevel"/>
+        </stroke>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/HSliderThumb_normal.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/HSliderThumb_normal.fxg
index 6197e22..17569ec 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/HSliderThumb_normal.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/HSliderThumb_normal.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,26 +18,27 @@
 
 -->
 
+
 <Graphic version="2.0" viewHeight="60" viewWidth="60" xmlns="http://ns.adobe.com/fxg/2008">
-  <Ellipse width="58" height="58" x="0" y="0" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="30" y="0" scaleX="58" rotation="90">
-        <GradientEntry ratio="0" alpha="0.15"/>
-        <GradientEntry ratio="1" alpha="0.25"/>
-      </LinearGradient>
-    </fill>
-  </Ellipse>
-  <Ellipse width="58" height="58" x="0" y="0" scaleX="1.5" scaleY="1.5">
-    <stroke>
-      <SolidColorStroke weight="2" caps="none"/>
-    </stroke>
-  </Ellipse>
-  <Ellipse width="58" height="58" x="0" y="0" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="26" y="10" scaleX="24" rotation="90">
-        <GradientEntry ratio="0" color="#FFFFFF" alpha="0.5"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/>
-      </LinearGradient>
-    </fill>
-  </Ellipse>
+      <Ellipse width="58" height="58" x="0" y="0">
+        <fill>
+          <LinearGradient x="30" y="0" scaleX="58" rotation="90">
+            <GradientEntry ratio="0" alpha="0.15"/>
+            <GradientEntry ratio="1" alpha="0.25"/>
+          </LinearGradient>
+        </fill>
+      </Ellipse>
+      <Ellipse width="58" height="58" x="0" y="0">
+        <stroke>
+          <SolidColorStroke weight="2" caps="none"/>
+        </stroke>
+      </Ellipse>
+      <Ellipse width="58" height="58" x="0" y="0">
+        <fill>
+          <LinearGradient x="26" y="10" scaleX="24" rotation="90">
+            <GradientEntry ratio="0" color="#FFFFFF" alpha="0.5"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/>
+          </LinearGradient>
+        </fill>
+      </Ellipse>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/HSliderThumb_pressed.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/HSliderThumb_pressed.fxg
index 374e935..e4ea710 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/HSliderThumb_pressed.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/HSliderThumb_pressed.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,38 +18,39 @@
 
 -->
 
-<Graphic version="2.0" viewHeight="60" viewWidth="60" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- outer ellipse -->
-  <Ellipse x="0.5" y="0.5" width="58" height="58" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="28.9995" y="0" scaleX="58.0005" rotation="90">
-        <GradientEntry ratio="0" alpha="0.05"/>
-        <GradientEntry ratio="1" alpha="0.15"/>
-      </LinearGradient>
-    </fill>
-  </Ellipse>
-  <!-- outer border -->
-  <Ellipse x="1.5" y="1.5" width="56" height="56" scaleX="1.5" scaleY="1.5">
-    <stroke>
-      <SolidColorStroke weight="2" caps="none" alpha="0.7"/>
-    </stroke>
-  </Ellipse>
-  <!-- inner ellipse -->
-  <Ellipse x="1.5" y="1.5" width="56" height="56" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="28.9995" y="4" scaleX="53.9995" rotation="90">
-        <GradientEntry ratio="0" alpha="0.25"/>
-        <GradientEntry ratio="1" alpha="0.6"/>
-      </LinearGradient>
-    </fill>
-  </Ellipse>
-  <!-- inner border -->
-  <Path x="1" y="1" data="M2.19238 28.75C2.19238 13.27 13.1533 2.21191 28.5 2.21191 43.8457 2.21191 54.8066 13.27 54.8066 28.75 54.8066 44.2324 43.8457 55.29 28.5 55.29 13.1533 55.29 2.19238 44.2324 2.19238 28.75ZM0 28.75C0 44.2324 13.1533 57.5 28.5 57.5 43.8457 57.5 57 44.2324 57 28.75 57 13.27 43.8457 0 28.5 0 13.1533 0 0 13.27 0 28.75Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="28.4995" y="4.10693" scaleX="53.3924" rotation="90">
-        <GradientEntry ratio="0" alpha="0.25"/>
-        <GradientEntry ratio="1" alpha="0.1"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+
+<Graphic version="2.0" viewHeight="60" viewWidth="60" xmlns="http://ns.adobe.com/fxg/2008" >
+	<!-- outer ellipse -->
+      <Ellipse x="0.5" y="0.5" width="58" height="58">
+        <fill>
+          <LinearGradient x="28.9995" y="0" scaleX="58.0005" rotation="90">
+            <GradientEntry ratio="0" alpha="0.05"/>
+            <GradientEntry ratio="1" alpha="0.15"/>
+          </LinearGradient>
+        </fill>
+      </Ellipse>
+	<!-- outer border -->
+      <Ellipse x="1.5" y="1.5" width="56" height="56">
+        <stroke>
+          <SolidColorStroke weight="2" caps="none" alpha="0.7"/>
+        </stroke>
+      </Ellipse>
+	<!-- inner ellipse -->
+      <Ellipse x="1.5" y="1.5" width="56" height="56">
+        <fill>
+          <LinearGradient x="28.9995" y="4" scaleX="53.9995" rotation="90">
+            <GradientEntry ratio="0" alpha="0.25"/>
+            <GradientEntry ratio="1" alpha="0.6"/>
+          </LinearGradient>
+        </fill>
+      </Ellipse>
+	<!-- inner border -->
+      <Path x="1" y="1" data="M2.19238 28.75C2.19238 13.27 13.1533 2.21191 28.5 2.21191 43.8457 2.21191 54.8066 13.27 54.8066 28.75 54.8066 44.2324 43.8457 55.29 28.5 55.29 13.1533 55.29 2.19238 44.2324 2.19238 28.75ZM0 28.75C0 44.2324 13.1533 57.5 28.5 57.5 43.8457 57.5 57 44.2324 57 28.75 57 13.27 43.8457 0 28.5 0 13.1533 0 0 13.27 0 28.75Z">
+        <fill>
+          <LinearGradient x="28.4995" y="4.10693" scaleX="53.3924" rotation="90">
+            <GradientEntry ratio="0" alpha="0.25"/>
+            <GradientEntry ratio="1" alpha="0.1"/>
+          </LinearGradient>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/HSliderTrack.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/HSliderTrack.fxg
index c87ae68..a0f7948 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/HSliderTrack.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/HSliderTrack.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,26 +18,28 @@
 
 -->
 
-<Graphic version="2.0" viewHeight="18" viewWidth="640" scaleGridLeft="30" scaleGridRight="610" scaleGridTop="1" scaleGridBottom="17" xmlns="http://ns.adobe.com/fxg/2008">
-  <Rect x="20" y="0.5" width="600" height="16" radiusX="7.24087" radiusY="7.24087" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="300" y="0" scaleX="16.0005" rotation="90">
-        <GradientEntry ratio="0" alpha="0.5"/>
-        <GradientEntry ratio="1" alpha="0.2"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <Path x="20" y="0.5" data="M0 8C2 4 4 2 8 2L592 2C596 2 598 4 600 8 600 4 596 0 592 0L8 0C4 0 0 4 0 8Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="300" y="0" scaleX="10" rotation="90">
-        <GradientEntry ratio="0" alpha="0.4"/>
-        <GradientEntry ratio="1" alpha="0.05"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Rect width="640" height="18" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor alpha="0"/>
-    </fill>
-  </Rect>
+
+<Graphic version="2.0" viewHeight="18" viewWidth="640" xmlns="http://ns.adobe.com/fxg/2008"
+         scaleGridLeft="30" scaleGridRight="610" scaleGridTop="1" scaleGridBottom="17">
+      <Rect x="20" y="0.5" width="600" height="16" radiusX="7.24087" radiusY="7.24087">
+        <fill>
+          <LinearGradient x="300" y="0" scaleX="16.0005" rotation="90">
+            <GradientEntry ratio="0" alpha="0.5"/>
+            <GradientEntry ratio="1" alpha="0.2"/>
+          </LinearGradient>
+        </fill>
+      </Rect>
+      <Path x="20" y="0.5" data="M0 8C2 4 4 2 8 2L592 2C596 2 598 4 600 8 600 4 596 0 592 0L8 0C4 0 0 4 0 8Z">
+        <fill>
+          <LinearGradient x="300" y="0" scaleX="10" rotation="90">
+            <GradientEntry ratio="0" alpha="0.4"/>
+            <GradientEntry ratio="1" alpha="0.05"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      <Rect width="640" height="18">
+        <fill>
+          <SolidColor alpha="0"/>
+        </fill>
+      </Rect>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ImageInvalid.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ImageInvalid.fxg
index f0ce977..98d1639 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ImageInvalid.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ImageInvalid.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,25 +18,29 @@
 
 -->
 
+
 <Graphic version="2.0" viewHeight="68" viewWidth="68" xmlns="http://ns.adobe.com/fxg/2008">
-  <Rect x="0.5" y="0.5" width="67" height="67" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#FFFFFF"/>
-    </fill>
-  </Rect>
-  <Path winding="nonZero" data="M67 1 67 67 1 67 1 1 67 1M68 0 0 0 0 68 68 68 68 0 68 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#FFFFFF"/>
-    </fill>
-  </Path>
-  <Path winding="nonZero" data="M0 0 0 68 68 68 68 0 0 0ZM64 64 4 64 4 4 64 4 64 64Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#969696"/>
-    </fill>
-  </Path>
-  <Path x="8" y="8" winding="nonZero" data="M0 0 0 52 52 52 52 0 0 0ZM26.1396 47.9668C23.5303 47.9668 21.5713 46.2676 21.5713 43.3945 21.5713 40.6543 23.5303 38.8906 26.1396 38.8906 28.8818 38.8906 30.71 40.7832 30.71 43.3945 30.71 46.1367 29.0127 47.9668 26.1396 47.9668ZM28.5557 29.6855&#xD;&#xA;C28.5557 30.8594 29.0127 32.0713 29.7295 33.3115 29.8623 33.5713 29.7295 34 29.4053 34L23.6592 34C23.333 34 23.2021 33.833 22.876 33.5088 21.7002 32.2002 21.1787 30.291 21.1787 28.9844 21.1787 23.7617 29.7295 20.5225 29.7295 15.2998 29.7295 12.752&#xD;&#xA; 27.6396 10.5117 23.6592 10.5117 20.3955 10.5117 18.3911 11.1543 16.1079 12.1338 15.8462 12.2646 16 12.1235 16 11.8618L16 6.70459C16 6.44287 15.6509 6.18213 15.9106 6.05127 17.5454 5.26807 20.6357 4.02881 25.4639 4.02881 33.1045 4.02881 37.9141&#xD;&#xA; 8.40186 37.9141 14.6694 37.9141 21.8491 28.5557 25.9644 28.5557 29.6855Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#969696"/>
-    </fill>
-  </Path>
+        <Rect x="0.5" y="0.5" width="67" height="67">
+          <fill>
+            <SolidColor color="#FFFFFF"/>
+          </fill>
+        </Rect>
+        <Path winding="nonZero" data="M67 1 67 67 1 67 1 1 67 1M68 0 0 0 0 68 68 68 68 0 68 0Z">
+          <fill>
+            <SolidColor color="#FFFFFF"/>
+          </fill>
+        </Path>
+      <Path winding="nonZero" data="M0 0 0 68 68 68 68 0 0 0ZM64 64 4 64 4 4 64 4 64 64Z">
+        <fill>
+          <SolidColor color="#969696"/>
+        </fill>
+      </Path>
+      <Path x="8" y="8" winding="nonZero" data="M0 0 0 52 52 52 52 0 0 0ZM26.1396 47.9668C23.5303 47.9668 21.5713 46.2676 21.5713 43.3945 21.5713 40.6543 23.5303 38.8906 26.1396 38.8906 28.8818 38.8906 30.71 40.7832 30.71 43.3945 30.71 46.1367 29.0127 47.9668 26.1396 47.9668ZM28.5557 29.6855
+C28.5557 30.8594 29.0127 32.0713 29.7295 33.3115 29.8623 33.5713 29.7295 34 29.4053 34L23.6592 34C23.333 34 23.2021 33.833 22.876 33.5088 21.7002 32.2002 21.1787 30.291 21.1787 28.9844 21.1787 23.7617 29.7295 20.5225 29.7295 15.2998 29.7295 12.752
+ 27.6396 10.5117 23.6592 10.5117 20.3955 10.5117 18.3911 11.1543 16.1079 12.1338 15.8462 12.2646 16 12.1235 16 11.8618L16 6.70459C16 6.44287 15.6509 6.18213 15.9106 6.05127 17.5454 5.26807 20.6357 4.02881 25.4639 4.02881 33.1045 4.02881 37.9141
+ 8.40186 37.9141 14.6694 37.9141 21.8491 28.5557 25.9644 28.5557 29.6855Z">
+        <fill>
+          <SolidColor color="#969696"/>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/RadioButton_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/RadioButton_down.fxg
index 1f88be0..4d7cdea 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/RadioButton_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/RadioButton_down.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,32 +17,32 @@
   limitations under the License.
 
 -->
-
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path data="M2 32C2 16 16 2 32 2 48 2 62 16 62 32 62 48 48 62 32 62 16 62 2 48 2 32ZM0 32C0 50 14 64 32 64 50 64 64 50 64 32 64 14 50 0 32 0 14 0 0 14 0 32Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="32" y="0" scaleX="64.0005" rotation="90">
-        <GradientEntry ratio="0" color="#FFFFFF" alpha="0"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.14902"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path x="4" y="4" data="M0 28C0 12 12 0 28 0 44 0 56 12 56 28 56 44 44 56 28 56 12 56 0 44 0 28Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="28" y="0" scaleX="56.0005" rotation="90">
-        <GradientEntry ratio="0" alpha="0.109804"/>
-        <GradientEntry ratio="1" alpha="0.4"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path x="4" y="4" alpha="0.14902" data="M0 28C0 12 12 0 28 0 44 0 56 12 56 28 56 44 44 56 28 56 12 56 0 44 0 28Z" scaleX="1.5" scaleY="1.5">
-    <stroke>
-      <SolidColorStroke weight="1" caps="none"/>
-    </stroke>
-  </Path>
-  <Path x="2" y="2" alpha="0.65098" data="M2 30C2 14 14 2 30 2 46 2 58 14 58 30 58 46 46 58 30 58 14 58 2 46 2 30ZM0 30C0 46 14 60 30 60 46 60 60 46 60 30 60 14 46 0 30 0 14 0 0 14 0 30Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor/>
-    </fill>
-  </Path>
+  
+      <Path data="M2 32C2 16 16 2 32 2 48 2 62 16 62 32 62 48 48 62 32 62 16 62 2 48 2 32ZM0 32C0 50 14 64 32 64 50 64 64 50 64 32 64 14 50 0 32 0 14 0 0 14 0 32Z">
+        <fill>
+          <LinearGradient x="32" y="0" scaleX="64.0005" rotation="90">
+            <GradientEntry ratio="0" color="#FFFFFF" alpha="0"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.14902"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      <Path x="4" y="4" data="M0 28C0 12 12 0 28 0 44 0 56 12 56 28 56 44 44 56 28 56 12 56 0 44 0 28Z">
+        <fill>
+          <LinearGradient x="28" y="0" scaleX="56.0005" rotation="90">
+            <GradientEntry ratio="0" alpha="0.109804"/>
+            <GradientEntry ratio="1" alpha="0.4"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      <Path x="4" y="4" alpha="0.14902" data="M0 28C0 12 12 0 28 0 44 0 56 12 56 28 56 44 44 56 28 56 12 56 0 44 0 28Z">
+        <stroke>
+          <SolidColorStroke weight="1" caps="none"/>
+        </stroke>
+      </Path>
+      <Path x="2" y="2" alpha="0.65098" data="M2 30C2 14 14 2 30 2 46 2 58 14 58 30 58 46 46 58 30 58 14 58 2 46 2 30ZM0 30C0 46 14 60 30 60 46 60 60 46 60 30 60 14 46 0 30 0 14 0 0 14 0 30Z">
+        <fill>
+          <SolidColor/>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/RadioButton_downSymbol.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/RadioButton_downSymbol.fxg
index e214754..6652cf1 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/RadioButton_downSymbol.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/RadioButton_downSymbol.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,19 +17,18 @@
   limitations under the License.
 
 -->
-
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path x="16" y="16" data="M0 16C0 8 8 0 16 0 24 0 32 8 32 16 32 24 24 32 16 32 8 32 0 24 0 16Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#646464"/>
-    </fill>
-  </Path>
-  <Path x="18" y="18" data="M0 14C0 6 6 0 14 0 22 0 28 6 28 14 28 22 22 28 14 28 6 28 0 22 0 14Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="14" y="0" scaleX="28" rotation="90">
-        <GradientEntry ratio="0" color="#787878"/>
-        <GradientEntry ratio="1" color="#969696"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+    <Path x="16" y="16" data="M0 16C0 8 8 0 16 0 24 0 32 8 32 16 32 24 24 32 16 32 8 32 0 24 0 16Z">
+    	<fill>
+		    <SolidColor color="#646464"/>
+    	</fill>
+	</Path>
+    <Path x="18" y="18" data="M0 14C0 6 6 0 14 0 22 0 28 6 28 14 28 22 22 28 14 28 6 28 0 22 0 14Z">
+    	<fill>
+    		<LinearGradient x="14" y="0" scaleX="28" rotation="90">
+    			<GradientEntry ratio="0" color="#787878"/>
+    			<GradientEntry ratio="1" color="#969696"/>
+    		</LinearGradient>
+    	</fill>
+    </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/RadioButton_downSymbolSelected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/RadioButton_downSymbolSelected.fxg
index 6877473..e425a8b 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/RadioButton_downSymbolSelected.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/RadioButton_downSymbolSelected.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,19 +17,18 @@
   limitations under the License.
 
 -->
-
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path x="16" y="16" data="M0 16C0 8 8 0 16 0 24 0 32 8 32 16 32 24 24 32 16 32 8 32 0 24 0 16Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#323232"/>
-    </fill>
-  </Path>
-  <Path x="18" y="18" data="M0 14C0 6 6 0 14 0 22 0 28 6 28 14 28 22 22 28 14 28 6 28 0 22 0 14Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="14" y="0" scaleX="30" rotation="90">
-        <GradientEntry ratio="0" color="#464646"/>
-        <GradientEntry ratio="1" color="#1E1E1E"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+    <Path x="16" y="16" data="M0 16C0 8 8 0 16 0 24 0 32 8 32 16 32 24 24 32 16 32 8 32 0 24 0 16Z">
+        <fill>
+        	<SolidColor color="#323232"/>
+        </fill>
+    </Path>
+    <Path x="18" y="18" data="M0 14C0 6 6 0 14 0 22 0 28 6 28 14 28 22 22 28 14 28 6 28 0 22 0 14Z">
+        <fill>
+            <LinearGradient x="14" y="0" scaleX="30" rotation="90">
+                <GradientEntry ratio="0" color="#464646"/>
+                <GradientEntry ratio="1" color="#1E1E1E"/>
+            </LinearGradient>
+        </fill>
+    </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/RadioButton_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/RadioButton_up.fxg
index c26a7bd..f6ea86f 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/RadioButton_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/RadioButton_up.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,27 +17,27 @@
   limitations under the License.
 
 -->
-
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path data="M2 32C2 16 16 2 32 2 48 2 62 16 62 32 62 48 48 62 32 62 16 62 2 48 2 32ZM0 32C0 50 14 64 32 64 50 64 64 50 64 32 64 14 50 0 32 0 14 0 0 14 0 32Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="32" y="0" scaleX="64.0005" rotation="90">
-        <GradientEntry ratio="0" alpha="0"/>
-        <GradientEntry ratio="1" alpha="0.2"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path x="2" y="2" alpha="0.6" data="M2 30C2 14 14 2 30 2 46 2 58 14 58 30 58 46 46 58 30 58 14 58 2 46 2 30ZM0 30C0 46 14 60 30 60 46 60 60 46 60 30 60 14 46 0 30 0 14 0 0 14 0 30Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor/>
-    </fill>
-  </Path>
-  <Path x="4" y="4" data="M0 28C0 12 12 0 28 0 44 0 56 12 56 28 56 44 44 56 28 56 12 56 0 44 0 28Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="28" y="8" scaleX="26.0002" rotation="90">
-        <GradientEntry ratio="0" color="#FFFFFF" alpha="0.8"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+  
+      <Path data="M2 32C2 16 16 2 32 2 48 2 62 16 62 32 62 48 48 62 32 62 16 62 2 48 2 32ZM0 32C0 50 14 64 32 64 50 64 64 50 64 32 64 14 50 0 32 0 14 0 0 14 0 32Z">
+        <fill>
+          <LinearGradient x="32" y="0" scaleX="64.0005" rotation="90">
+            <GradientEntry ratio="0" alpha="0"/>
+            <GradientEntry ratio="1" alpha="0.2"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      <Path x="2" y="2" alpha="0.6" data="M2 30C2 14 14 2 30 2 46 2 58 14 58 30 58 46 46 58 30 58 14 58 2 46 2 30ZM0 30C0 46 14 60 30 60 46 60 60 46 60 30 60 14 46 0 30 0 14 0 0 14 0 30Z">
+        <fill>
+          <SolidColor/>
+        </fill>
+      </Path>
+      <Path x="4" y="4" data="M0 28C0 12 12 0 28 0 44 0 56 12 56 28 56 44 44 56 28 56 12 56 0 44 0 28Z">
+        <fill>
+          <LinearGradient x="28" y="8" scaleX="26.0002" rotation="90">
+            <GradientEntry ratio="0" color="#FFFFFF" alpha="0.8"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0"/>
+          </LinearGradient>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/RadioButton_upSymbol.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/RadioButton_upSymbol.fxg
index 7ca6efe..a9e5b14 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/RadioButton_upSymbol.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/RadioButton_upSymbol.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,19 +17,18 @@
   limitations under the License.
 
 -->
-
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path x="16" y="16" data="M0 16C0 8 8 0 16 0 24 0 32 8 32 16 32 24 24 32 16 32 8 32 0 24 0 16Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#969696"/>
-    </fill>
-  </Path>
-  <Path x="18" y="18" data="M0 14C0 6 6 0 14 0 22 0 28 6 28 14 28 22 22 28 14 28 6 28 0 22 0 14Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="14" y="0" scaleX="20" rotation="90">
-        <GradientEntry ratio="0" color="#999999"/>
-        <GradientEntry ratio="1" color="#B4B4B4"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+    <Path x="16" y="16" data="M0 16C0 8 8 0 16 0 24 0 32 8 32 16 32 24 24 32 16 32 8 32 0 24 0 16Z">
+        <fill>
+        	<SolidColor color="#969696"/>
+        </fill>
+    </Path>
+    <Path x="18" y="18" data="M0 14C0 6 6 0 14 0 22 0 28 6 28 14 28 22 22 28 14 28 6 28 0 22 0 14Z">
+        <fill>
+            <LinearGradient x="14" y="0" scaleX="20" rotation="90">
+                <GradientEntry ratio="0" color="#999999"/>
+                <GradientEntry ratio="1" color="#B4B4B4"/>
+            </LinearGradient>
+        </fill>
+    </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/RadioButton_upSymbolSelected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/RadioButton_upSymbolSelected.fxg
index 4a05190..449affb 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/RadioButton_upSymbolSelected.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/RadioButton_upSymbolSelected.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,19 +17,18 @@
   limitations under the License.
 
 -->
-
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path x="16" y="16" data="M0 16C0 8 8 0 16 0 24 0 32 8 32 16 32 24 24 32 16 32 8 32 0 24 0 16Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#323232"/>
-    </fill>
-  </Path>
-  <Path x="18" y="18" data="M0 14C0 6 6 0 14 0 22 0 28 6 28 14 28 22 22 28 14 28 6 28 0 22 0 14Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="14" y="0" scaleX="30" rotation="90">
-        <GradientEntry ratio="0" color="#5A5A5A"/>
-        <GradientEntry ratio="1" color="#323232"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+	<Path x="16" y="16" data="M0 16C0 8 8 0 16 0 24 0 32 8 32 16 32 24 24 32 16 32 8 32 0 24 0 16Z">
+    	<fill>
+    		<SolidColor color="#323232"/>
+        </fill>
+	</Path>
+    <Path x="18" y="18" data="M0 14C0 6 6 0 14 0 22 0 28 6 28 14 28 22 22 28 14 28 6 28 0 22 0 14Z">
+    	<fill>
+        	<LinearGradient x="14" y="0" scaleX="30" rotation="90">
+            	<GradientEntry ratio="0" color="#5A5A5A"/>
+            	<GradientEntry ratio="1" color="#323232"/>
+          	</LinearGradient>
+		</fill>
+	</Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/SpinnerListContainerBackground.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/SpinnerListContainerBackground.fxg
index d6ead46..77865dc 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/SpinnerListContainerBackground.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/SpinnerListContainerBackground.fxg
@@ -17,16 +17,17 @@
   limitations under the License.
 
 -->
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008" viewHeight= "100" viewWidth= "100"
+	scaleGridLeft="12" scaleGridTop="12" scaleGridRight="88" scaleGridBottom="88">
 
-<Graphic version="2.0" viewHeight="100" viewWidth="100" scaleGridLeft="12" scaleGridTop="12" scaleGridRight="88" scaleGridBottom="88" xmlns="http://ns.adobe.com/fxg/2008">
-  <Rect width="100" height="100" radiusX="10" radiusY="10" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#4D4D4D"/>
-    </fill>
-  </Rect>
-  <Rect x="2" y="2" width="96" height="96" radiusX="10" radiusY="10" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#F2F2F2"/>
-    </fill>
-  </Rect>
+	<Rect width="100" height="100" radiusX="10" radiusY="10">
+		<fill>
+			<SolidColor color="#4D4D4D"/>
+		</fill>
+	</Rect>
+	<Rect x="2" y="2" width="96" height="96" radiusX="10" radiusY="10">
+		<fill>	
+			<SolidColor color="#F2F2F2"/>
+		</fill>
+	</Rect>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/SpinnerListContainerSelectionIndicator.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/SpinnerListContainerSelectionIndicator.fxg
index 7c4220f..421d325 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/SpinnerListContainerSelectionIndicator.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/SpinnerListContainerSelectionIndicator.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,51 +17,51 @@
   limitations under the License.
 
 -->
-
-<Graphic version="2.0" viewHeight="96" viewWidth="100" scaleGridLeft="5" scaleGridTop="12" scaleGridRight="95" scaleGridBottom="83" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- Transparent rect used to center the bar -->
-  <Rect x="0" y="0" width="100" height="8" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- Border -->
-  <Path y="8" winding="nonZero" data="M100 80 0 80 0 0 100 0 100 80ZM2 78 98 78 98 2 2 2 2 78Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#666666"/>
-    </fill>
-  </Path>
-  <!-- Two tone gradient background -->
-  <Rect x="2" y="10" width="96" height="76" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient rotation="90">
-        <GradientEntry ratio="0.0" color="#E6E6E6" alpha="0.2"/>
-        <GradientEntry ratio="0.2" color="#E6E6E6" alpha="0.4"/>
-        <GradientEntry ratio="0.5" color="#E6E6E6" alpha="0.3"/>
-        <GradientEntry ratio="0.5" color="#000000" alpha="0.12"/>
-        <GradientEntry ratio="1.0" color="#000000" alpha="0.2"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- Top highlight -->
-  <Rect x="4" y="10" width="92" height="2" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#FFFFFF"/>
-    </fill>
-  </Rect>
-  <!-- Bottom highlight -->
-  <Rect x="4" y="84" width="92" height="2" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#FFFFFF"/>
-    </fill>
-  </Rect>
-  <!-- Shadow -->
-  <Rect x="4" y="88" width="92" height="8" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient rotation="90">
-        <GradientEntry ratio="0" color="#000000" alpha="0.15"/>
-        <GradientEntry ratio="1" color="#000000" alpha="0"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-</Graphic>
\ No newline at end of file
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008" viewHeight="96" viewWidth="100"
+	scaleGridLeft="5" scaleGridTop="12" scaleGridRight="95" scaleGridBottom="83">
+	<!-- Transparent rect used to center the bar -->
+	<Rect x="0" y="0" width="100" height="8">
+		<fill>
+			<SolidColor color="#000000" alpha="0"/>
+		</fill>
+	</Rect>
+	<!-- Border --> 
+	<Path y="8" winding="nonZero" data="M100 80 0 80 0 0 100 0 100 80ZM2 78 98 78 98 2 2 2 2 78Z">
+        <fill>
+           	<SolidColor color="#666666"/>
+    	</fill>
+   	</Path>
+   	<!-- Two tone gradient background -->
+   	<Rect x="2" y="10" width="96" height="76">
+       	<fill>
+   			<LinearGradient rotation="90">
+               	<GradientEntry ratio="0.0" color="#E6E6E6" alpha="0.2"/>
+   				<GradientEntry ratio="0.2" color="#E6E6E6" alpha="0.4"/>
+   				<GradientEntry ratio="0.5" color="#E6E6E6" alpha="0.3"/>
+   				<GradientEntry ratio="0.5" color="#000000" alpha="0.12"/>
+   				<GradientEntry ratio="1.0" color="#000000" alpha="0.2"/>
+   			</LinearGradient>
+   		</fill>
+   	</Rect>
+   	<!-- Top highlight -->
+   	<Rect x="4" y="10" width="92" height="2">
+       	<fill>
+           	<SolidColor color="#FFFFFF"/>
+        </fill>
+   	</Rect>
+   	<!-- Bottom highlight -->
+   	<Rect x="4" y="84" width="92" height="2">
+       	<fill>
+           	<SolidColor color="#FFFFFF"/>
+		</fill>
+   	</Rect>
+   	<!-- Shadow -->
+    <Rect x="4" y="88" width="92" height="8">
+  		<fill>
+   			<LinearGradient rotation="90">
+   				<GradientEntry ratio="0" color="#000000" alpha="0.15"/>
+   				<GradientEntry ratio="1" color="#000000" alpha="0"/>
+   			</LinearGradient>
+        </fill>
+   	</Rect>
+</Graphic>
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/SpinnerListContainerShadow.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/SpinnerListContainerShadow.fxg
index 342d1aa..7e0835e 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/SpinnerListContainerShadow.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/SpinnerListContainerShadow.fxg
@@ -17,16 +17,16 @@
   limitations under the License.
 
 -->
-
-<Graphic version="2.0" viewHeight="100" viewWidth="100" scaleGridLeft="10" scaleGridTop="10" scaleGridRight="90" scaleGridBottom="90" xmlns="http://ns.adobe.com/fxg/2008">
-  <Rect width="100" height="100" radiusX="10" radiusY="10" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient rotation="270">
-        <GradientEntry ratio="0.0" color="#231F20" alpha="0.7"/>
-        <GradientEntry ratio="0.35" color="#FFFFFF" alpha="0"/>
-        <GradientEntry ratio="0.75" color="#EAE9E9" alpha="0"/>
-        <GradientEntry ratio="1.0" color="#231F20" alpha="0.65"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008" viewHeight= "100" viewWidth= "100"
+	scaleGridLeft="10" scaleGridTop="10" scaleGridRight="90" scaleGridBottom="90">
+	<Rect width="100" height="100" radiusX="10" radiusY="10">
+		<fill>
+			<LinearGradient rotation="270">
+				<GradientEntry ratio="0.0" color="#231F20" alpha="0.7"/>
+				<GradientEntry ratio="0.35" color="#FFFFFF" alpha="0"/>
+				<GradientEntry ratio="0.75" color="#EAE9E9" alpha="0"/>
+				<GradientEntry ratio="1.0" color="#231F20" alpha="0.65"/>
+			</LinearGradient>
+		</fill>
+	</Rect>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TabbedViewNavigatorButtonBarFirstButton_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TabbedViewNavigatorButtonBarFirstButton_down.fxg
index 8dfdddb..62e833f 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TabbedViewNavigatorButtonBarFirstButton_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TabbedViewNavigatorButtonBarFirstButton_down.fxg
@@ -18,38 +18,46 @@
 
 -->
 
-<Graphic version="2.0" scaleGridTop="4" scaleGridBottom="72" scaleGridLeft="3" scaleGridRight="117" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- highlight fill -->
-  <Rect x="0" y="2" width="120" height="72" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="0" scaleX="72" rotation="90">
-        <GradientEntry color="#000000" ratio="0" alpha=".3"/>
-        <GradientEntry color="#000000" ratio="1" alpha=".15"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- border top -->
-  <Rect x="0" y="0" width="120" height="2" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.75"/>
-    </fill>
-  </Rect>
-  <!-- border bottom -->
-  <Rect x="0" y="74" width="120" height="2" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.75"/>
-    </fill>
-  </Rect>
-  <!-- highlight stroke -->
-  <Rect x="0.5" y="2.5" width="119" height="71" scaleX="1.5" scaleY="1.5">
-    <stroke>
-      <SolidColorStroke color="#000000" weight="1" alpha=".1"/>
-    </stroke>
-  </Rect>
-  <!-- scaling fix -->
-  <Rect x="0" y="0" width="120" height="76" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0"/>
-    </fill>
-  </Rect>
+
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridTop="4" scaleGridBottom="72" scaleGridLeft="3" scaleGridRight="117">
+    
+    <!-- highlight fill -->
+    <Rect x="0" y="2" width="120" height="72">
+        <fill>
+            <LinearGradient x="0" scaleX="72" rotation="90">
+                <GradientEntry color="#000000" ratio="0" alpha=".3"/>
+                <GradientEntry color="#000000" ratio="1" alpha=".15"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+    
+    <!-- border top -->
+    <Rect x="0" y="0" width="120" height="2">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.75"/>
+        </fill>
+    </Rect>
+    
+    <!-- border bottom -->
+    <Rect x="0" y="74" width="120" height="2">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.75"/>
+        </fill>
+    </Rect>
+    
+    <!-- highlight stroke -->
+    <Rect x="0.5" y="2.5" width="119" height="71">
+    	<stroke>
+    		<SolidColorStroke color="#000000" weight="1" alpha=".1"/>
+    	</stroke>
+    </Rect>
+    
+    <!-- scaling fix -->
+    <Rect x="0" y="0" width="120" height="76">
+        <fill>
+    		<SolidColor color="#000000" alpha="0"/>
+        </fill>
+    </Rect>
+    
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TabbedViewNavigatorButtonBarFirstButton_selected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TabbedViewNavigatorButtonBarFirstButton_selected.fxg
index c2b7418..dd2249c 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TabbedViewNavigatorButtonBarFirstButton_selected.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TabbedViewNavigatorButtonBarFirstButton_selected.fxg
@@ -18,38 +18,45 @@
 
 -->
 
-<Graphic version="2.0" scaleGridTop="4" scaleGridBottom="72" scaleGridLeft="3" scaleGridRight="117" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- highlight fill -->
-  <Rect x="0" y="2" width="120" height="72" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="0" scaleX="72" rotation="90">
-        <GradientEntry color="#000000" ratio="0" alpha=".05"/>
-        <GradientEntry color="#000000" ratio="1" alpha=".1"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- border top -->
-  <Rect x="0" y="0" width="120" height="2" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.75"/>
-    </fill>
-  </Rect>
-  <!-- border bottom -->
-  <Rect x="0" y="74" width="120" height="2" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.75"/>
-    </fill>
-  </Rect>
-  <!-- highlight stroke -->
-  <Rect x="0.5" y="2.5" width="119" height="71" scaleX="1.5" scaleY="1.5">
-    <stroke>
-      <SolidColorStroke color="#000000" weight="1" alpha=".1"/>
-    </stroke>
-  </Rect>
-  <!-- scaling fix -->
-  <Rect x="0" y="0" width="120" height="76" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0"/>
-    </fill>
-  </Rect>
+
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridTop="4" scaleGridBottom="72" scaleGridLeft="3" scaleGridRight="117">
+    
+    <!-- highlight fill -->
+    <Rect x="0" y="2" width="120" height="72">
+        <fill>
+            <LinearGradient x="0" scaleX="72" rotation="90">
+                <GradientEntry color="#000000" ratio="0" alpha=".05"/>
+                <GradientEntry color="#000000" ratio="1" alpha=".1"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+    
+    <!-- border top -->
+    <Rect x="0" y="0" width="120" height="2">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.75"/>
+        </fill>
+    </Rect>
+    <!-- border bottom -->
+    <Rect x="0" y="74" width="120" height="2">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.75"/>
+        </fill>
+    </Rect>
+    
+    <!-- highlight stroke -->
+    <Rect x="0.5" y="2.5" width="119" height="71">
+    	<stroke>
+    		<SolidColorStroke color="#000000" weight="1" alpha=".1"/>
+    	</stroke>
+    </Rect>
+    
+    <!-- scaling fix -->
+    <Rect x="0" y="0" width="120" height="76">
+        <fill>
+    		<SolidColor color="#000000" alpha="0"/>
+        </fill>
+    </Rect>
+    
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TabbedViewNavigatorButtonBarFirstButton_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TabbedViewNavigatorButtonBarFirstButton_up.fxg
index b027be2..aaa564d 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TabbedViewNavigatorButtonBarFirstButton_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TabbedViewNavigatorButtonBarFirstButton_up.fxg
@@ -18,38 +18,45 @@
 
 -->
 
-<Graphic version="2.0" scaleGridTop="4" scaleGridBottom="72" scaleGridLeft="3" scaleGridRight="117" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- highlight fill -->
-  <Rect x="0" y="2" width="120" height="72" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="0" scaleX="72" rotation="90">
-        <GradientEntry color="#ffffff" ratio="0" alpha=".2"/>
-        <GradientEntry color="#ffffff" ratio="1" alpha="0"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- border top -->
-  <Rect x="0" y="0" width="120" height="2" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.75"/>
-    </fill>
-  </Rect>
-  <!-- border bottom -->
-  <Rect x="0" y="74" width="120" height="2" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.75"/>
-    </fill>
-  </Rect>
-  <!-- highlight stroke -->
-  <Rect x="0.5" y="2.5" width="119" height="71" scaleX="1.5" scaleY="1.5">
-    <stroke>
-      <SolidColorStroke color="#ffffff" weight="1" alpha=".2"/>
-    </stroke>
-  </Rect>
-  <!-- scaling fix -->
-  <Rect x="0" y="0" width="120" height="76" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0"/>
-    </fill>
-  </Rect>
+
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridTop="4" scaleGridBottom="72" scaleGridLeft="3" scaleGridRight="117">
+    
+    <!-- highlight fill -->
+    <Rect x="0" y="2" width="120" height="72">
+        <fill>
+            <LinearGradient x="0" scaleX="72" rotation="90">
+                <GradientEntry color="#ffffff" ratio="0" alpha=".2"/>
+                <GradientEntry color="#ffffff" ratio="1" alpha="0"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+    
+    <!-- border top -->
+    <Rect x="0" y="0" width="120" height="2">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.75"/>
+        </fill>
+    </Rect>
+    <!-- border bottom -->
+    <Rect x="0" y="74" width="120" height="2">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.75"/>
+        </fill>
+    </Rect>
+    
+    <!-- highlight stroke -->
+    <Rect x="0.5" y="2.5" width="119" height="71">
+    	<stroke>
+    		<SolidColorStroke color="#ffffff" weight="1" alpha=".2"/>
+    	</stroke>
+    </Rect>
+    
+    <!-- scaling fix -->
+    <Rect x="0" y="0" width="120" height="76">
+        <fill>
+    		<SolidColor color="#000000" alpha="0"/>
+        </fill>
+    </Rect>
+    
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TabbedViewNavigatorButtonBarLastButton_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TabbedViewNavigatorButtonBarLastButton_down.fxg
index 4293ab6..b47587e 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TabbedViewNavigatorButtonBarLastButton_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TabbedViewNavigatorButtonBarLastButton_down.fxg
@@ -18,44 +18,51 @@
 
 -->
 
-<Graphic version="2.0" scaleGridTop="4" scaleGridBottom="72" scaleGridLeft="3" scaleGridRight="117" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- highlight fill -->
-  <Rect x="2" y="2" width="118" height="72" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="0" scaleX="72" rotation="90">
-        <GradientEntry color="#000000" ratio="0" alpha=".3"/>
-        <GradientEntry color="#000000" ratio="1" alpha=".15"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- border top -->
-  <Rect x="0" y="0" width="120" height="2" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.75"/>
-    </fill>
-  </Rect>
-  <!-- border bottom -->
-  <Rect x="0" y="74" width="120" height="2" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.75"/>
-    </fill>
-  </Rect>
-  <!-- border left -->
-  <Rect x="0" y="2" width="2" height="72" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.8"/>
-    </fill>
-  </Rect>
-  <!-- highlight stroke -->
-  <Rect x="2.5" y="2.5" width="117" height="71" scaleX="1.5" scaleY="1.5">
-    <stroke>
-      <SolidColorStroke color="#000000" weight="1" alpha=".1"/>
-    </stroke>
-  </Rect>
-  <!-- scaling fix -->
-  <Rect x="0" y="0" width="120" height="76" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0"/>
-    </fill>
-  </Rect>
+
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridTop="4" scaleGridBottom="72" scaleGridLeft="3" scaleGridRight="117">
+    
+    <!-- highlight fill -->
+    <Rect x="2" y="2" width="118" height="72">
+        <fill>
+            <LinearGradient x="0" scaleX="72" rotation="90">
+                <GradientEntry color="#000000" ratio="0" alpha=".3"/>
+                <GradientEntry color="#000000" ratio="1" alpha=".15"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+    
+    <!-- border top -->
+    <Rect x="0" y="0" width="120" height="2">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.75"/>
+        </fill>
+    </Rect>
+    <!-- border bottom -->
+    <Rect x="0" y="74" width="120" height="2">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.75"/>
+        </fill>
+    </Rect>
+    <!-- border left -->
+    <Rect x="0" y="2" width="2" height="72">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.8"/>
+        </fill>
+    </Rect>
+    
+    <!-- highlight stroke -->
+    <Rect x="2.5" y="2.5" width="117" height="71">
+    	<stroke>
+    		<SolidColorStroke color="#000000" weight="1" alpha=".1"/>
+    	</stroke>
+    </Rect>
+    
+    <!-- scaling fix -->
+    <Rect x="0" y="0" width="120" height="76">
+        <fill>
+    		<SolidColor color="#000000" alpha="0"/>
+        </fill>
+    </Rect>
+    
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TabbedViewNavigatorButtonBarLastButton_selected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TabbedViewNavigatorButtonBarLastButton_selected.fxg
index eb77245..173b7eb 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TabbedViewNavigatorButtonBarLastButton_selected.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TabbedViewNavigatorButtonBarLastButton_selected.fxg
@@ -18,44 +18,51 @@
 
 -->
 
-<Graphic version="2.0" scaleGridTop="4" scaleGridBottom="72" scaleGridLeft="3" scaleGridRight="117" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- highlight fill -->
-  <Rect x="2" y="2" width="118" height="72" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="0" scaleX="72" rotation="90">
-        <GradientEntry color="#000000" ratio="0" alpha=".05"/>
-        <GradientEntry color="#000000" ratio="1" alpha=".1"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- border top -->
-  <Rect x="0" y="0" width="120" height="2" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.75"/>
-    </fill>
-  </Rect>
-  <!-- border bottom -->
-  <Rect x="0" y="74" width="120" height="2" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.75"/>
-    </fill>
-  </Rect>
-  <!-- border left -->
-  <Rect x="0" y="2" width="2" height="72" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.8"/>
-    </fill>
-  </Rect>
-  <!-- highlight stroke -->
-  <Rect x="2.5" y="2.5" width="117" height="71" scaleX="1.5" scaleY="1.5">
-    <stroke>
-      <SolidColorStroke color="#000000" weight="1" alpha=".1"/>
-    </stroke>
-  </Rect>
-  <!-- scaling fix -->
-  <Rect x="0" y="0" width="120" height="76" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0"/>
-    </fill>
-  </Rect>
+
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridTop="4" scaleGridBottom="72" scaleGridLeft="3" scaleGridRight="117">
+    
+    <!-- highlight fill -->
+    <Rect x="2" y="2" width="118" height="72">
+        <fill>
+            <LinearGradient x="0" scaleX="72" rotation="90">
+                <GradientEntry color="#000000" ratio="0" alpha=".05"/>
+                <GradientEntry color="#000000" ratio="1" alpha=".1"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+    
+    <!-- border top -->
+    <Rect x="0" y="0" width="120" height="2">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.75"/>
+        </fill>
+    </Rect>
+    <!-- border bottom -->
+    <Rect x="0" y="74" width="120" height="2">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.75"/>
+        </fill>
+    </Rect>
+    <!-- border left -->
+    <Rect x="0" y="2" width="2" height="72">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.8"/>
+        </fill>
+    </Rect>
+    
+    <!-- highlight stroke -->
+    <Rect x="2.5" y="2.5" width="117" height="71">
+    	<stroke>
+    		<SolidColorStroke color="#000000" weight="1" alpha=".1"/>
+    	</stroke>
+    </Rect>
+    
+    <!-- scaling fix -->
+    <Rect x="0" y="0" width="120" height="76">
+        <fill>
+    		<SolidColor color="#000000" alpha="0"/>
+        </fill>
+    </Rect>
+    
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TabbedViewNavigatorButtonBarLastButton_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TabbedViewNavigatorButtonBarLastButton_up.fxg
index 6cde6f0..54d9365 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TabbedViewNavigatorButtonBarLastButton_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TabbedViewNavigatorButtonBarLastButton_up.fxg
@@ -18,44 +18,51 @@
 
 -->
 
-<Graphic version="2.0" scaleGridTop="4" scaleGridBottom="72" scaleGridLeft="3" scaleGridRight="117" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- highlight fill -->
-  <Rect x="2" y="2" width="118" height="72" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="0" scaleX="72" rotation="90">
-        <GradientEntry color="#ffffff" ratio="0" alpha=".2"/>
-        <GradientEntry color="#ffffff" ratio="1" alpha="0"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- border top -->
-  <Rect x="0" y="0" width="120" height="2" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.75"/>
-    </fill>
-  </Rect>
-  <!-- border bottom -->
-  <Rect x="0" y="74" width="120" height="2" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.75"/>
-    </fill>
-  </Rect>
-  <!-- border left -->
-  <Rect x="0" y="2" width="2" height="72" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.8"/>
-    </fill>
-  </Rect>
-  <!-- highlight stroke -->
-  <Rect x="2.5" y="2.5" width="117" height="71" scaleX="1.5" scaleY="1.5">
-    <stroke>
-      <SolidColorStroke color="#ffffff" weight="1" alpha=".2"/>
-    </stroke>
-  </Rect>
-  <!-- scaling fix -->
-  <Rect x="0" y="0" width="120" height="76" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0"/>
-    </fill>
-  </Rect>
+
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridTop="4" scaleGridBottom="72" scaleGridLeft="3" scaleGridRight="117">
+    
+    <!-- highlight fill -->
+    <Rect x="2" y="2" width="118" height="72">
+        <fill>
+            <LinearGradient x="0" scaleX="72" rotation="90">
+                <GradientEntry color="#ffffff" ratio="0" alpha=".2"/>
+                <GradientEntry color="#ffffff" ratio="1" alpha="0"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+    
+    <!-- border top -->
+    <Rect x="0" y="0" width="120" height="2">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.75"/>
+        </fill>
+    </Rect>
+    <!-- border bottom -->
+    <Rect x="0" y="74" width="120" height="2">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.75"/>
+        </fill>
+    </Rect>
+    <!-- border left -->
+    <Rect x="0" y="2" width="2" height="72">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.8"/>
+        </fill>
+    </Rect>
+    
+    <!-- highlight stroke -->
+    <Rect x="2.5" y="2.5" width="117" height="71">
+    	<stroke>
+    		<SolidColorStroke color="#ffffff" weight="1" alpha=".2"/>
+    	</stroke>
+    </Rect>
+    
+    <!-- scaling fix -->
+    <Rect x="0" y="0" width="120" height="76">
+        <fill>
+    		<SolidColor color="#000000" alpha="0"/>
+        </fill>
+    </Rect>
+    
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TextInput_border.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TextInput_border.fxg
index 39e6fc1..eecb9b9 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TextInput_border.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TextInput_border.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,17 +18,22 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="16" scaleGridTop="16" scaleGridRight="504" scaleGridBottom="50" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- border -->
-  <Path data="M12 2 508 2C514 2 518 6 518 12L518 54C518 60 514 64 508 64L12 64C6 64 2 60 2 54L2 12C2 6 6 2 12 2ZM12 0C6 0 0 6 0 12L0 54C0 60 6 66 12 66L508 66C514 66 520 60 520 54L520 12C520 6 514 0 508 0L12 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#505050"/>
-    </fill>
-  </Path>
-  <!-- inner shadow -->
-  <Path x="2" y="2" alpha="0.2" data="M10 3 506 3C510 3 514 7 514 11L514 52C514 56 510 60 506 60L10 60C6 60 2 56 2 52L2 11C2 7 6 3 10 3ZM10 0C4 0 0 4 0 10L0 52C0 58 4 62 10 62L506 62C512 62 516 58 516 52L516 10C516 4 512 0 506 0L10 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#030303"/>
-    </fill>
-  </Path>
+
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+         scaleGridLeft="16" scaleGridTop="16" scaleGridRight="504" scaleGridBottom="50">
+         
+    <!-- border -->
+    <Path data="M12 2 508 2C514 2 518 6 518 12L518 54C518 60 514 64 508 64L12 64C6 64 2 60 2 54L2 12C2 6 6 2 12 2ZM12 0C6 0 0 6 0 12L0 54C0 60 6 66 12 66L508 66C514 66 520 60 520 54L520 12C520 6 514 0 508 0L12 0Z">
+        <fill>
+            <SolidColor color="#505050"/>
+        </fill>
+    </Path>
+      
+    <!-- inner shadow -->
+    <Path x="2" y="2" alpha="0.2" data="M10 3 506 3C510 3 514 7 514 11L514 52C514 56 510 60 506 60L10 60C6 60 2 56 2 52L2 11C2 7 6 3 10 3ZM10 0C4 0 0 4 0 10L0 52C0 58 4 62 10 62L506 62C512 62 516 58 516 52L516 10C516 4 512 0 506 0L10 0Z">
+        <fill>
+            <SolidColor color="#030303"/>
+        </fill>
+    </Path>
+     
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ToggleSwitch_contentShadow.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ToggleSwitch_contentShadow.fxg
index 994b19a..bd26d9a 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ToggleSwitch_contentShadow.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ToggleSwitch_contentShadow.fxg
@@ -17,15 +17,14 @@
   limitations under the License.
 
 -->
-
-<Graphic version="2.0" viewHeight="56" viewWidth="142" scaleGridLeft="28" scaleGridTop="20" scaleGridRight="114" scaleGridBottom="28" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path winding="nonZero" data="M0 0 0 56 28 56C20 56 14 49.7324 14 42 14 34.2676 20 28 28 28L114 28C122 28 128 34.2676 128 42 128 49.7324 122 56 114 56L142 56 142 0 0 0Z" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient rotation="90">
-        <GradientEntry ratio="0" alpha="0.1"/>
-        <GradientEntry ratio="0.5" alpha="0.2"/>
-        <GradientEntry ratio="1" alpha="0.1"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+<Graphic version="2.0" viewHeight="56" viewWidth="142" xmlns="http://ns.adobe.com/fxg/2008" scaleGridLeft="28" scaleGridTop="20" scaleGridRight="114" scaleGridBottom="28">
+	<Path winding="nonZero" data="M0 0 0 56 28 56C20 56 14 49.7324 14 42 14 34.2676 20 28 28 28L114 28C122 28 128 34.2676 128 42 128 49.7324 122 56 114 56L142 56 142 0 0 0Z">
+		<fill>
+			<LinearGradient rotation="90">
+				<GradientEntry ratio="0" alpha="0.1"/>
+				<GradientEntry ratio="0.5" alpha="0.2"/>
+				<GradientEntry ratio="1" alpha="0.1"/>
+			</LinearGradient>
+		</fill>
+	</Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TransparentActionButton_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TransparentActionButton_down.fxg
index 7672150..d6f0fda 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TransparentActionButton_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TransparentActionButton_down.fxg
@@ -18,45 +18,52 @@
 
 -->
 
-<Graphic version="2.0" scaleGridTop="6" scaleGridBottom="59" scaleGridLeft="9" scaleGridRight="76" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- highlight border leading -->
-  <Rect x="0" y="1" width="1" height="63" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="0" scaleX="63" rotation="90">
-        <GradientEntry color="#ffffff" ratio="0" alpha=".15"/>
-        <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- separator dark -->
-  <Rect x="1" y="0" width="2" height="65" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.8"/>
-    </fill>
-  </Rect>
-  <!-- inner shaddow -->
-  <Rect x="3" y="0" width="80" height="65" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="0" scaleX="65" rotation="90">
-        <GradientEntry color="#000000" ratio="0" alpha=".05"/>
-        <GradientEntry color="#000000" ratio="1" alpha=".25"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <Rect x="3.5" y="0.5" width="79" height="64" alpha="0.2" scaleX="1.5" scaleY="1.5">
-    <stroke>
-      <SolidColorStroke color="#000000" weight="1" caps="none" joints="miter"/>
-    </stroke>
-  </Rect>
-  <Rect x="4.5" y="1.5" width="77" height="62" alpha="0.1" scaleX="1.5" scaleY="1.5">
-    <stroke>
-      <SolidColorStroke color="#000000" weight="1" caps="none" joints="miter"/>
-    </stroke>
-  </Rect>
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="0" width="83" height="65" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
+
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridTop="6" scaleGridBottom="59" scaleGridLeft="9" scaleGridRight="76">
+    
+    <!-- highlight border leading -->
+    <Rect x="0" y="1" width="1" height="63">
+        <fill>
+            <LinearGradient x="0" scaleX="63" rotation="90">
+                <GradientEntry color="#ffffff" ratio="0" alpha=".15"/>
+                <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+    
+    <!-- separator dark -->
+    <Rect x="1" y="0" width="2" height="65">
+        <fill>
+            <SolidColor color="#000000" alpha="0.8"/>
+        </fill>
+    </Rect>
+    
+    <!-- inner shaddow -->
+    <Rect x="3" y="0" width="80" height="65">
+        <fill>
+            <LinearGradient x="0" scaleX="65" rotation="90">
+                <GradientEntry color="#000000" ratio="0" alpha=".05"/>
+                <GradientEntry color="#000000" ratio="1" alpha=".25"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+    
+    <Rect x="3.5" y="0.5" width="79" height="64" alpha="0.2">
+        <stroke>
+            <SolidColorStroke color="#000000" weight="1" caps="none" joints="miter"/>
+        </stroke>
+    </Rect>
+    <Rect x="4.5" y="1.5" width="77" height="62" alpha="0.1">
+        <stroke>
+            <SolidColorStroke color="#000000" weight="1" caps="none" joints="miter"/>
+        </stroke>
+    </Rect>
+
+    <!-- invisible fix for scaling -->
+    <Rect x="0" y="0" width="83" height="65">
+        <fill>
+            <SolidColor color="#ffffff" alpha="0"/>
+        </fill>
+    </Rect>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TransparentActionButton_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TransparentActionButton_up.fxg
index 8f3219e..d177333 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TransparentActionButton_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TransparentActionButton_up.fxg
@@ -18,35 +18,42 @@
 
 -->
 
-<Graphic version="2.0" scaleGridTop="1" scaleGridBottom="64" scaleGridLeft="4" scaleGridRight="82" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- highlight border leading -->
-  <Rect x="0" y="1" width="1" height="63" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="0" scaleX="63" rotation="90">
-        <GradientEntry color="#ffffff" ratio="0" alpha=".25"/>
-        <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- separator dark -->
-  <Rect x="1" y="0" width="2" height="65" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.8"/>
-    </fill>
-  </Rect>
-  <!-- highlight border left-->
-  <Rect x="3" y="1" width="1" height="63" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="0" scaleX="63" rotation="90">
-        <GradientEntry color="#ffffff" ratio="0" alpha=".25"/>
-        <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="0" width="83" height="65" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
+
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridTop="1" scaleGridBottom="64" scaleGridLeft="4" scaleGridRight="82" >
+    
+    <!-- highlight border leading -->
+    <Rect x="0" y="1" width="1" height="63">
+        <fill>
+            <LinearGradient x="0" scaleX="63" rotation="90">
+                <GradientEntry color="#ffffff" ratio="0" alpha=".25"/>
+                <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+    
+    <!-- separator dark -->
+    <Rect x="1" y="0" width="2" height="65">
+        <fill>
+            <SolidColor color="#000000" alpha="0.8"/>
+        </fill>
+    </Rect>
+	
+	<!-- highlight border left-->
+    <Rect x="3" y="1" width="1" height="63">
+        <fill>
+            <LinearGradient x="0" scaleX="63" rotation="90">
+                <GradientEntry color="#ffffff" ratio="0" alpha=".25"/>
+                <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+
+	<!-- invisible fix for scaling -->
+	<Rect x="0" y="0" width="83" height="65">
+		<fill>
+			<SolidColor color="#ffffff" alpha="0"/>
+		</fill>
+	</Rect>
+	
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TransparentNavigationButton_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TransparentNavigationButton_down.fxg
index cd34225..2be2a93 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TransparentNavigationButton_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TransparentNavigationButton_down.fxg
@@ -18,45 +18,52 @@
 
 -->
 
-<Graphic version="2.0" scaleGridTop="6" scaleGridBottom="59" scaleGridLeft="6" scaleGridRight="74" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- inner shaddow -->
-  <Rect x="0" y="0" width="80" height="65" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="0" scaleX="65" rotation="90">
-        <GradientEntry color="#000000" ratio="0" alpha=".05"/>
-        <GradientEntry color="#000000" ratio="1" alpha=".25"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <Rect x="0.5" y="0.5" width="79" height="64" alpha="0.2" scaleX="1.5" scaleY="1.5">
-    <stroke>
-      <SolidColorStroke color="#000000" weight="1" caps="none" joints="miter"/>
-    </stroke>
-  </Rect>
-  <Rect x="1.5" y="1.5" width="77" height="62" alpha="0.1" scaleX="1.5" scaleY="1.5">
-    <stroke>
-      <SolidColorStroke color="#000000" weight="1" caps="none" joints="miter"/>
-    </stroke>
-  </Rect>
-  <!-- separator dark -->
-  <Rect x="80" y="0" width="2" height="65" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.8"/>
-    </fill>
-  </Rect>
-  <!-- highlight border trailing -->
-  <Rect x="82" y="1" width="1" height="63" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="0" scaleX="63" rotation="90">
-        <GradientEntry color="#ffffff" ratio="0" alpha=".25"/>
-        <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="1" width="83" height="63" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
+
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridTop="6" scaleGridBottom="59" scaleGridLeft="6" scaleGridRight="74">
+    
+    <!-- inner shaddow -->
+    <Rect x="0" y="0" width="80" height="65">
+        <fill>
+            <LinearGradient x="0" scaleX="65" rotation="90">
+                <GradientEntry color="#000000" ratio="0" alpha=".05"/>
+                <GradientEntry color="#000000" ratio="1" alpha=".25"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+    
+    <Rect x="0.5" y="0.5" width="79" height="64" alpha="0.2">
+        <stroke>
+            <SolidColorStroke color="#000000" weight="1" caps="none" joints="miter"/>
+        </stroke>
+    </Rect>
+    <Rect x="1.5" y="1.5" width="77" height="62" alpha="0.1">
+        <stroke>
+            <SolidColorStroke color="#000000" weight="1" caps="none" joints="miter"/>
+        </stroke>
+    </Rect>
+    
+    <!-- separator dark -->
+    <Rect x="80" y="0" width="2" height="65">
+        <fill>
+            <SolidColor color="#000000" alpha="0.8"/>
+        </fill>
+    </Rect>
+    
+    <!-- highlight border trailing -->
+    <Rect x="82" y="1" width="1" height="63">
+        <fill>
+            <LinearGradient x="0" scaleX="63" rotation="90">
+                <GradientEntry color="#ffffff" ratio="0" alpha=".25"/>
+                <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+
+    <!-- invisible fix for scaling -->
+    <Rect x="0" y="1" width="83" height="63">
+        <fill>
+            <SolidColor color="#ffffff" alpha="0"/>
+        </fill>
+    </Rect>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TransparentNavigationButton_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TransparentNavigationButton_up.fxg
index b08b362..cb3d304 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TransparentNavigationButton_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/TransparentNavigationButton_up.fxg
@@ -18,35 +18,42 @@
 
 -->
 
-<Graphic version="2.0" scaleGridTop="1" scaleGridBottom="64" scaleGridLeft="1" scaleGridRight="79" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- highlight border right -->
-  <Rect x="79" y="1" width="1" height="63" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="0" scaleX="63" rotation="90">
-        <GradientEntry color="#ffffff" ratio="0" alpha=".25"/>
-        <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- separator dark -->
-  <Rect x="80" y="0" width="2" height="65" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0.8"/>
-    </fill>
-  </Rect>
-  <!-- highlight border trailing -->
-  <Rect x="82" y="1" width="1" height="63" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient x="0" scaleX="63" rotation="90">
-        <GradientEntry color="#ffffff" ratio="0" alpha=".25"/>
-        <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="0" width="83" height="65" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
+
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridTop="1" scaleGridBottom="64" scaleGridLeft="1" scaleGridRight="79" >
+    
+	<!-- highlight border right -->
+    <Rect x="79" y="1" width="1" height="63">
+        <fill>
+            <LinearGradient x="0" scaleX="63" rotation="90">
+                <GradientEntry color="#ffffff" ratio="0" alpha=".25"/>
+                <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+    
+    <!-- separator dark -->
+    <Rect x="80" y="0" width="2" height="65">
+        <fill>
+            <SolidColor color="#000000" alpha="0.8"/>
+        </fill>
+    </Rect>
+    
+    <!-- highlight border trailing -->
+    <Rect x="82" y="1" width="1" height="63">
+        <fill>
+            <LinearGradient x="0" scaleX="63" rotation="90">
+                <GradientEntry color="#ffffff" ratio="0" alpha=".25"/>
+                <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+
+	<!-- invisible fix for scaling -->
+	<Rect x="0" y="0" width="83" height="65">
+		<fill>
+			<SolidColor color="#ffffff" alpha="0"/>
+		</fill>
+	</Rect>
+	
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ViewMenuItem_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ViewMenuItem_down.fxg
index 45216ff..5deda34 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ViewMenuItem_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ViewMenuItem_down.fxg
@@ -17,33 +17,38 @@
   limitations under the License.
 
 -->
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+	scaleGridLeft="6" scaleGridRight="152" scaleGridTop="6" scaleGridBottom="94">
+	
+	<!-- Transparent Rect to ensure proper scaling -->
+	<Rect width="158" height="100" x="0" y="0">
+		<fill>
+			<SolidColor color="#000000" alpha="0"/>
+		</fill>
+	</Rect>	
+	
+	<!-- overlay -->	
+	<Rect width="158" height="100" x="0" y="0">
+		<fill>
+			<LinearGradient rotation = "90">
+				<GradientEntry color="#000000" ratio="0" alpha="0.25"/>
+				<GradientEntry color="#000000" ratio="1" alpha="0.05"/>
+			</LinearGradient>
+		</fill>
+	</Rect>
 
-<Graphic version="2.0" scaleGridLeft="6" scaleGridRight="152" scaleGridTop="6" scaleGridBottom="94" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- Transparent Rect to ensure proper scaling -->
-  <Rect width="158" height="100" x="0" y="0" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- overlay -->
-  <Rect width="158" height="100" x="0" y="0" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <LinearGradient rotation="90">
-        <GradientEntry color="#000000" ratio="0" alpha="0.25"/>
-        <GradientEntry color="#000000" ratio="1" alpha="0.05"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- Outermost border -->
-  <Rect width="156" height="98" x="1" y="1" scaleX="1.5" scaleY="1.5">
-    <stroke>
-      <SolidColorStroke color="#000000" weight="2" alpha="0.2" joints="miter"/>
-    </stroke>
-  </Rect>
-  <!-- Middle Outer Border -->
-  <Rect width="152" height="94" x="3" y="3" scaleX="1.5" scaleY="1.5">
-    <stroke>
-      <SolidColorStroke color="#000000" weight="2" alpha="0.1" joints="miter"/>
-    </stroke>
-  </Rect>
+	<!-- Outermost border -->
+	<Rect width="156" height="98" x="1" y="1">
+		<stroke>
+			<SolidColorStroke color="#000000" weight="2" alpha="0.2" joints="miter"/>
+		</stroke>
+	</Rect>
+	
+	<!-- Middle Outer Border -->
+	<Rect width="152" height="94" x="3" y="3">
+		<stroke>
+			<SolidColorStroke color="#000000" weight="2" alpha="0.1" joints="miter"/>
+		</stroke>
+	</Rect>
+
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ViewMenuItem_showsCaret.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ViewMenuItem_showsCaret.fxg
index 9401d98..49af087 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ViewMenuItem_showsCaret.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ViewMenuItem_showsCaret.fxg
@@ -17,18 +17,20 @@
   limitations under the License.
 
 -->
-
-<Graphic version="2.0" scaleGridLeft="3" scaleGridRight="155" scaleGridTop="3" scaleGridBottom="97" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- Transparent Rect to ensure proper scaling -->
-  <Rect width="158" height="100" x="0" y="0" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- Border -->
-  <Rect width="156" height="98" x="1" y="1" scaleX="1.5" scaleY="1.5">
-    <stroke>
-      <SolidColorStroke weight="2" color="#ffffff" alpha=".25" joints="miter"/>
-    </stroke>
-  </Rect>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+	scaleGridLeft="3" scaleGridRight="155" scaleGridTop="3" scaleGridBottom="97">
+	
+	<!-- Transparent Rect to ensure proper scaling --> 
+	<Rect width="158" height="100" x="0" y="0">
+		<fill>
+			<SolidColor color="#000000" alpha="0"/>
+		</fill>
+	</Rect>
+	
+	<!-- Border -->
+	<Rect width="156" height="98" x="1" y="1">
+		<stroke>
+			<SolidColorStroke weight="2" color="#ffffff" alpha=".25" joints="miter"/>
+		</stroke>
+	</Rect>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ViewMenuItem_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ViewMenuItem_up.fxg
index 9401d98..55ccaf9 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ViewMenuItem_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile480/assets/ViewMenuItem_up.fxg
@@ -17,18 +17,21 @@
   limitations under the License.
 
 -->
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+	scaleGridLeft="3" scaleGridRight="155" scaleGridTop="3" scaleGridBottom="97">
 
-<Graphic version="2.0" scaleGridLeft="3" scaleGridRight="155" scaleGridTop="3" scaleGridBottom="97" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- Transparent Rect to ensure proper scaling -->
-  <Rect width="158" height="100" x="0" y="0" scaleX="1.5" scaleY="1.5">
-    <fill>
-      <SolidColor color="#000000" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- Border -->
-  <Rect width="156" height="98" x="1" y="1" scaleX="1.5" scaleY="1.5">
-    <stroke>
-      <SolidColorStroke weight="2" color="#ffffff" alpha=".25" joints="miter"/>
-    </stroke>
-  </Rect>
+	<!-- Transparent Rect to ensure proper scaling -->
+	<Rect width="158" height="100" x="0" y="0">
+		<fill>
+			<SolidColor color="#000000" alpha="0"/>
+		</fill>
+	</Rect>
+
+	<!-- Border -->
+	<Rect width="156" height="98" x="1" y="1">
+		<stroke>
+			<SolidColorStroke weight="2" color="#ffffff" alpha=".25" joints="miter"/>
+		</stroke>
+	</Rect>
+
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ActionBarBackground.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ActionBarBackground.fxg
index 1aeb28b..b975f7e 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ActionBarBackground.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ActionBarBackground.fxg
@@ -18,81 +18,85 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="2" scaleGridTop="3" scaleGridRight="88" scaleGridBottom="61" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- border top -->
-  <Rect x="0" y="0" width="90" height="2" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0.75"/>
-    </fill>
-  </Rect>
-  <!-- border bottom -->
-  <Rect x="0" y="62" width="90" height="2" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0.85"/>
-    </fill>
-  </Rect>
-  <!-- drop shadow (6 filled rects) -->
-  <Rect x="0" y="64" width="90" height="1" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0.35"/>
-    </fill>
-  </Rect>
-  <Rect x="0" y="65" width="90" height="1" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0.25"/>
-    </fill>
-  </Rect>
-  <Rect x="0" y="66" width="90" height="1" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0.2"/>
-    </fill>
-  </Rect>
-  <Rect x="0" y="67" width="90" height="1" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0.15"/>
-    </fill>
-  </Rect>
-  <Rect x="0" y="68" width="90" height="1" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0.1"/>
-    </fill>
-  </Rect>
-  <Rect x="0" y="69" width="90" height="1" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0.05"/>
-    </fill>
-  </Rect>
-  <!-- highlight border -->
-  <Rect x="1" y="2" width="88" height="1" alpha=".25" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#ffffff"/>
-    </fill>
-  </Rect>
-  <Rect x="1" y="61" width="88" height="1" alpha="0.1" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#ffffff"/>
-    </fill>
-  </Rect>
-  <Rect x="0" y="2" width="1" height="60" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="0" scaleX="60" rotation="90">
-        <GradientEntry color="#ffffff" ratio="0" alpha=".25"/>
-        <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <Rect x="89" y="2" width="1" height="60" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="0" scaleX="60" rotation="90">
-        <GradientEntry color="#ffffff" ratio="0" alpha=".25"/>
-        <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="0" width="90" height="70" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="2" scaleGridTop="3" scaleGridRight="88" scaleGridBottom="61">
+    
+    <!-- border top -->
+    <Rect x="0" y="0" width="90" height="2">
+        <fill>
+            <SolidColor color="#000000" alpha="0.75"/>
+        </fill>
+    </Rect>
+    <!-- border bottom -->
+    <Rect x="0" y="62" width="90" height="2">
+        <fill>
+            <SolidColor color="#000000" alpha="0.85"/>
+        </fill>
+    </Rect>
+    <!-- drop shadow (6 filled rects) -->
+    <Rect x="0" y="64" width="90" height="1">
+        <fill>
+            <SolidColor color="#000000" alpha="0.35"/>
+        </fill>
+    </Rect>
+    <Rect x="0" y="65" width="90" height="1">
+        <fill>
+            <SolidColor color="#000000" alpha="0.25"/>
+        </fill>
+    </Rect>
+    <Rect x="0" y="66" width="90" height="1">
+        <fill>
+            <SolidColor color="#000000" alpha="0.2"/>
+        </fill>
+    </Rect>
+    <Rect x="0" y="67" width="90" height="1">
+        <fill>
+            <SolidColor color="#000000" alpha="0.15"/>
+        </fill>
+    </Rect>
+    <Rect x="0" y="68" width="90" height="1">
+        <fill>
+            <SolidColor color="#000000" alpha="0.1"/>
+        </fill>
+    </Rect>
+    <Rect x="0" y="69" width="90" height="1">
+        <fill>
+            <SolidColor color="#000000" alpha="0.05"/>
+        </fill>
+    </Rect>
+    
+    <!-- highlight border -->
+    <Rect x="1" y="2" width="88" height="1" alpha=".25">
+        <fill>
+        	<SolidColor color="#ffffff"/>
+        </fill>
+    </Rect>
+    <Rect x="1" y="61" width="88" height="1" alpha="0.1">
+        <fill>
+        	<SolidColor color="#ffffff"/>
+        </fill>
+    </Rect>
+    <Rect x="0" y="2" width="1" height="60">
+        <fill>
+            <LinearGradient x="0" scaleX="60" rotation="90">
+                <GradientEntry color="#ffffff" ratio="0" alpha=".25"/>
+                <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+    <Rect x="89" y="2" width="1" height="60">
+        <fill>
+            <LinearGradient x="0" scaleX="60" rotation="90">
+                <GradientEntry color="#ffffff" ratio="0" alpha=".25"/>
+                <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+    
+    <!-- invisible fix for scaling -->
+    <Rect x="0" y="0" width="90" height="70">
+        <fill>
+            <SolidColor color="#ffffff" alpha="0"/>
+        </fill>
+    </Rect>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/BeveledActionButton_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/BeveledActionButton_down.fxg
index 37fab30..5c894eb 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/BeveledActionButton_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/BeveledActionButton_down.fxg
@@ -18,35 +18,44 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="8" scaleGridRight="48" scaleGridTop="8" scaleGridBottom="48" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="0" width="56" height="56" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- border -->
-  <Path winding="nonZero" data="M56 48C56 52.418 52.418 56 48 56L8 56C3.58203 56 0 52.418 0 48L0 7.93848C0 3.521 3.58203 0 8 0L48 0C52.418 0 56 3.521 56 7.93848L56 48ZM54.667 8C54.667 4.31836 51.6821 1.3335 48 1.3335L8 1.3335C4.31836 1.3335 1.3335 4.31836 1.3335 8L1.3335 48&#xD;&#xA;C1.3335 51.6826 4.31836 54.667 8 54.667L48 54.667C51.6821 54.667 54.667 51.6826 54.667 48L54.667 8Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#323232"/>
-    </fill>
-  </Path>
-  <!-- shadow fill -->
-  <Rect x="1.3335" y="1.3335" width="53.3335" height="53.3335" radiusX="6.66885" radiusY="6.66885" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="26.667" y="0" scaleX="30.1528" rotation="90">
-        <GradientEntry ratio="0" alpha="0.25"/>
-        <GradientEntry ratio="1" alpha="0"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- inner highlight -->
-  <Path x="1.3335" y="1.3335" winding="nonZero" data="M46.6665 1.3335C49.606 1.3335 51.9995 3.72607 51.9995 6.6665L51.9995 46.6665C51.9995 49.606 49.606 51.9995 46.6665 51.9995L6.6665 51.9995C3.72607 51.9995 1.3335 49.606 1.3335 46.6665L1.3335 6.6665C1.3335 3.72607 3.72607 1.3335 6.6665 1.3335L46.6665&#xD;&#xA; 1.3335ZM46.6665 0 6.6665 0C2.98486 0 0 2.98486 0 6.6665L0 46.6665C0 50.3491 2.98486 53.3335 6.6665 53.3335L46.6665 53.3335C50.3486 53.3335 53.3335 50.3491 53.3335 46.6665L53.3335 6.6665C53.3335 2.98486 50.3486 0 46.6665 0L46.6665 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="26.667" y="1.3335" scaleX="50.6673" rotation="90">
-        <GradientEntry ratio="0" color="#FFFFFF" alpha="0.05"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="8" scaleGridRight="48" scaleGridTop="8" scaleGridBottom="48">
+
+    <!-- invisible fix for scaling -->
+    <Rect x="0" y="0" width="56" height="56">
+        <fill>
+            <SolidColor color="#ffffff" alpha="0"/>
+        </fill>
+    </Rect>
+
+
+    <!-- border -->
+      <Path winding="nonZero" data="M56 48C56 52.418 52.418 56 48 56L8 56C3.58203 56 0 52.418 0 48L0 7.93848C0 3.521 3.58203 0 8 0L48 0C52.418 0 56 3.521 56 7.93848L56 48ZM54.667 8C54.667 4.31836 51.6821 1.3335 48 1.3335L8 1.3335C4.31836 1.3335 1.3335 4.31836 1.3335 8L1.3335 48
+C1.3335 51.6826 4.31836 54.667 8 54.667L48 54.667C51.6821 54.667 54.667 51.6826 54.667 48L54.667 8Z">
+        <fill>
+          <SolidColor color="#323232"/>
+        </fill>
+      </Path>
+
+    <!-- shadow fill -->
+      <Rect x="1.3335" y="1.3335" width="53.3335" height="53.3335" radiusX="6.66885" radiusY="6.66885">
+        <fill>
+          <LinearGradient x="26.667" y="0" scaleX="30.1528" rotation="90">
+            <GradientEntry ratio="0" alpha="0.25"/>
+            <GradientEntry ratio="1" alpha="0"/>
+          </LinearGradient>
+        </fill>
+      </Rect>
+
+    <!-- inner highlight -->
+      <Path x="1.3335" y="1.3335" winding="nonZero" data="M46.6665 1.3335C49.606 1.3335 51.9995 3.72607 51.9995 6.6665L51.9995 46.6665C51.9995 49.606 49.606 51.9995 46.6665 51.9995L6.6665 51.9995C3.72607 51.9995 1.3335 49.606 1.3335 46.6665L1.3335 6.6665C1.3335 3.72607 3.72607 1.3335 6.6665 1.3335L46.6665
+ 1.3335ZM46.6665 0 6.6665 0C2.98486 0 0 2.98486 0 6.6665L0 46.6665C0 50.3491 2.98486 53.3335 6.6665 53.3335L46.6665 53.3335C50.3486 53.3335 53.3335 50.3491 53.3335 46.6665L53.3335 6.6665C53.3335 2.98486 50.3486 0 46.6665 0L46.6665 0Z">
+        <fill>
+          <LinearGradient x="26.667" y="1.3335" scaleX="50.6673" rotation="90">
+            <GradientEntry ratio="0" color="#FFFFFF" alpha="0.05"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/BeveledActionButton_fill.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/BeveledActionButton_fill.fxg
index 25a341c..f42c38c 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/BeveledActionButton_fill.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/BeveledActionButton_fill.fxg
@@ -18,17 +18,21 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="8" scaleGridRight="48" scaleGridTop="8" scaleGridBottom="48" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="0" width="56" height="56" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- chromeColor fill -->
-  <Rect x="1.3335" y="1.3335" width="53.3335" height="53.3335" radiusX="6.66885" radiusY="6.66885" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#484848"/>
-    </fill>
-  </Rect>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="8" scaleGridRight="48" scaleGridTop="8" scaleGridBottom="48">
+
+    <!-- invisible fix for scaling -->
+    <Rect x="0" y="0" width="56" height="56">
+        <fill>
+            <SolidColor color="#ffffff" alpha="0"/>
+        </fill>
+    </Rect>
+
+    <!-- chromeColor fill -->
+      <Rect x="1.3335" y="1.3335" width="53.3335" height="53.3335" radiusX="6.66885" radiusY="6.66885">
+        <fill>
+          <SolidColor color="#484848"/>
+        </fill>
+      </Rect>
+
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/BeveledActionButton_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/BeveledActionButton_up.fxg
index 4bf9971..9c35d54 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/BeveledActionButton_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/BeveledActionButton_up.fxg
@@ -18,37 +18,46 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="8" scaleGridRight="48" scaleGridTop="8" scaleGridBottom="48" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="0" width="56" height="56" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- border -->
-  <Path winding="nonZero" data="M56 48C56 52.418 52.418 56 48 56L8 56C3.58203 56 0 52.418 0 48L0 7.93848C0 3.521 3.58203 0 8 0L48 0C52.418 0 56 3.521 56 7.93848L56 48ZM54.667 8C54.667 4.31836 51.6821 1.3335 48 1.3335L8 1.3335C4.31836 1.3335 1.3335 4.31836 1.3335 8L1.3335 48&#xD;&#xA;C1.3335 51.6826 4.31836 54.667 8 54.667L48 54.667C51.6821 54.667 54.667 51.6826 54.667 48L54.667 8Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#323232"/>
-    </fill>
-  </Path>
-  <!-- shadow fill -->
-  <Rect x="1.3335" y="1.3335" width="53.3335" height="53.3335" radiusX="6.66885" radiusY="6.66885" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="26.667" y="0" scaleX="53.334" rotation="90">
-        <GradientEntry ratio="0" color="#FFFFFF" alpha="0.4"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- inner highlight -->
-  <Path x="1.3335" y="1.3335" winding="nonZero" data="M46.6665 1.3335C49.606 1.3335 51.9995 3.72607 51.9995 6.6665L51.9995 46.6665C51.9995 49.606 49.606 51.9995 46.6665 51.9995L6.6665 51.9995C3.72607 51.9995 1.3335 49.606 1.3335 46.6665L1.3335 6.6665C1.3335 3.72607 3.72607 1.3335 6.6665 1.3335L46.6665&#xD;&#xA; 1.3335ZM46.6665 0 6.6665 0C2.98486 0 0 2.98486 0 6.6665L0 46.6665C0 50.3491 2.98486 53.3335 6.6665 53.3335L46.6665 53.3335C50.3486 53.3335 53.3335 50.3491 53.3335 46.6665L53.3335 6.6665C53.3335 2.98486 50.3486 0 46.6665 0L46.6665 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="26.667" y="0" scaleX="53.334" rotation="90">
-        <GradientEntry ratio="0" alpha="0.35"/>
-        <GradientEntry ratio="0.662577" alpha="0.1"/>
-        <GradientEntry ratio="0.871166" color="#FFFFFF" alpha="0.05"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.2"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="8" scaleGridRight="48" scaleGridTop="8" scaleGridBottom="48">
+
+    <!-- invisible fix for scaling -->
+    <Rect x="0" y="0" width="56" height="56">
+        <fill>
+            <SolidColor color="#ffffff" alpha="0"/>
+        </fill>
+    </Rect>
+
+
+    <!-- border -->
+      <Path winding="nonZero" data="M56 48C56 52.418 52.418 56 48 56L8 56C3.58203 56 0 52.418 0 48L0 7.93848C0 3.521 3.58203 0 8 0L48 0C52.418 0 56 3.521 56 7.93848L56 48ZM54.667 8C54.667 4.31836 51.6821 1.3335 48 1.3335L8 1.3335C4.31836 1.3335 1.3335 4.31836 1.3335 8L1.3335 48
+C1.3335 51.6826 4.31836 54.667 8 54.667L48 54.667C51.6821 54.667 54.667 51.6826 54.667 48L54.667 8Z">
+        <fill>
+          <SolidColor color="#323232"/>
+        </fill>
+      </Path>
+
+    <!-- shadow fill -->
+      <Rect x="1.3335" y="1.3335" width="53.3335" height="53.3335" radiusX="6.66885" radiusY="6.66885">
+        <fill>
+          <LinearGradient x="26.667" y="0" scaleX="53.334" rotation="90">
+            <GradientEntry ratio="0" color="#FFFFFF" alpha="0.4"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/>
+          </LinearGradient>
+        </fill>
+      </Rect>
+
+    <!-- inner highlight -->
+      <Path x="1.3335" y="1.3335" winding="nonZero" data="M46.6665 1.3335C49.606 1.3335 51.9995 3.72607 51.9995 6.6665L51.9995 46.6665C51.9995 49.606 49.606 51.9995 46.6665 51.9995L6.6665 51.9995C3.72607 51.9995 1.3335 49.606 1.3335 46.6665L1.3335 6.6665C1.3335 3.72607 3.72607 1.3335 6.6665 1.3335L46.6665
+ 1.3335ZM46.6665 0 6.6665 0C2.98486 0 0 2.98486 0 6.6665L0 46.6665C0 50.3491 2.98486 53.3335 6.6665 53.3335L46.6665 53.3335C50.3486 53.3335 53.3335 50.3491 53.3335 46.6665L53.3335 6.6665C53.3335 2.98486 50.3486 0 46.6665 0L46.6665 0Z">
+        <fill>
+          <LinearGradient x="26.667" y="0" scaleX="53.334" rotation="90">
+            <GradientEntry ratio="0" alpha="0.35"/>
+            <GradientEntry ratio="0.662577" alpha="0.1"/>
+            <GradientEntry ratio="0.871166" color="#FFFFFF" alpha="0.05"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.2"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/BeveledBackButton_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/BeveledBackButton_down.fxg
index 7c902c5..f5c5e2e 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/BeveledBackButton_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/BeveledBackButton_down.fxg
@@ -18,35 +18,46 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="26" scaleGridRight="108" scaleGridTop="10" scaleGridBottom="46" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="0" width="116" height="56" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- border -->
-  <Path winding="nonZero" data="M108 1.3335C111.676 1.3335 114.666 4.32422 114.666 8L114.666 48C114.666 51.6758 111.676 54.667 108 54.667L25.3774 54.668C20.3945 54.668 17.8164 49.1543 16.1416 47.4805 16.0859 47.3994 7.12305 35.5176 2 27.8545 7.12891 20.1772 16.1851 8.41016 16.2344&#xD;&#xA; 8.34131 19.2275 4.5791 21.083 1.3335 25.3335 1.3335L108 1.3335 108 1.3335ZM25.3335 0C19.8101 0 18.6875 2.55322 15.1445 7.57178 15.1445 7.57178 5.33301 20 0 28 5.33301 36 15.0469 48.2393 15.0469 48.2393 19.0469 53.5732 20 56 25.3335 56L108 56&#xD;&#xA;C112.418 56 116 52.418 116 48L116 8C116 3.58203 112.418 0 108 0L25.3335 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#323232"/>
-    </fill>
-  </Path>
-  <!-- shadow fill -->
-  <Path x="2" y="1.3335" winding="nonZero" data="M106 0C109.676 0 112.666 2.99072 112.666 6.6665L112.666 46.6665C112.666 50.3423 109.676 53.3335 106 53.3335L23.3774 53.3345C18.3945 53.3345 15.8164 47.8208 14.1416 46.147 14.0859 46.0659 5.12305 34.1841 0 26.521 5.12891 18.8438 14.1851 7.07666&#xD;&#xA; 14.2344 7.00781 17.2275 3.24561 18.9585 0 23.3335 0L106 0 106 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="56.3325" y="0" scaleX="30.1525" rotation="90">
-        <GradientEntry ratio="0" alpha="0.25"/>
-        <GradientEntry ratio="1" alpha="0"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- highlight border -->
-  <Path x="2" y="1.33203" winding="nonZero" data="M106 1.33301C108.94 1.33301 111.334 3.7251 111.334 6.66699L111.334 46.666C111.334 49.6074 108.94 52.001 106 52.001L23.3774 52.001C19.625 52.001 15.0728 45.1279 15.0728 45.1279 11.7827 39.9365 4.44189 30.7852 1.60254 26.521 4.40576 22.3188 15.3125&#xD;&#xA; 7.79443 15.3125 7.79443 15.854 7.02051 19.6455 1.33301 23.3335 1.33301L106 1.33301ZM22.75 0C18.6875 0 16.417 4.26465 14.2344 7.00781 14.1851 7.07715 5.12891 18.8438 0 26.521 5.12305 34.1851 14.0859 46.0664 14.1416 46.1465 15.8164 47.8223 18.3945&#xD;&#xA; 53.335 23.3774 53.335L106 53.335C109.676 53.335 112.666 50.3428 112.666 46.666L112.666 6.66699C112.666 2.99072 109.676 0 106 0L22.75 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="56.3325" y="0" scaleX="57.0461" rotation="90">
-        <GradientEntry ratio="0" color="#FFFFFF" alpha="0.05"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+	scaleGridLeft="26" scaleGridRight="108" scaleGridTop="10" scaleGridBottom="46">
+
+	<!-- invisible fix for scaling -->
+	<Rect x="0" y="0" width="116" height="56">
+		<fill>
+			<SolidColor color="#ffffff" alpha="0"/>
+		</fill>
+	</Rect>
+
+	<!-- border -->
+      <Path winding="nonZero" data="M108 1.3335C111.676 1.3335 114.666 4.32422 114.666 8L114.666 48C114.666 51.6758 111.676 54.667 108 54.667L25.3774 54.668C20.3945 54.668 17.8164 49.1543 16.1416 47.4805 16.0859 47.3994 7.12305 35.5176 2 27.8545 7.12891 20.1772 16.1851 8.41016 16.2344
+ 8.34131 19.2275 4.5791 21.083 1.3335 25.3335 1.3335L108 1.3335 108 1.3335ZM25.3335 0C19.8101 0 18.6875 2.55322 15.1445 7.57178 15.1445 7.57178 5.33301 20 0 28 5.33301 36 15.0469 48.2393 15.0469 48.2393 19.0469 53.5732 20 56 25.3335 56L108 56
+C112.418 56 116 52.418 116 48L116 8C116 3.58203 112.418 0 108 0L25.3335 0Z">
+        <fill>
+          <SolidColor color="#323232"/>
+        </fill>
+      </Path>
+
+	<!-- shadow fill -->
+      <Path x="2" y="1.3335" winding="nonZero" data="M106 0C109.676 0 112.666 2.99072 112.666 6.6665L112.666 46.6665C112.666 50.3423 109.676 53.3335 106 53.3335L23.3774 53.3345C18.3945 53.3345 15.8164 47.8208 14.1416 46.147 14.0859 46.0659 5.12305 34.1841 0 26.521 5.12891 18.8438 14.1851 7.07666
+ 14.2344 7.00781 17.2275 3.24561 18.9585 0 23.3335 0L106 0 106 0Z">
+        <fill>
+          <LinearGradient x="56.3325" y="0" scaleX="30.1525" rotation="90">
+            <GradientEntry ratio="0" alpha="0.25"/>
+            <GradientEntry ratio="1" alpha="0"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+
+	<!-- highlight border -->
+      <Path x="2" y="1.33203" winding="nonZero" data="M106 1.33301C108.94 1.33301 111.334 3.7251 111.334 6.66699L111.334 46.666C111.334 49.6074 108.94 52.001 106 52.001L23.3774 52.001C19.625 52.001 15.0728 45.1279 15.0728 45.1279 11.7827 39.9365 4.44189 30.7852 1.60254 26.521 4.40576 22.3188 15.3125
+ 7.79443 15.3125 7.79443 15.854 7.02051 19.6455 1.33301 23.3335 1.33301L106 1.33301ZM22.75 0C18.6875 0 16.417 4.26465 14.2344 7.00781 14.1851 7.07715 5.12891 18.8438 0 26.521 5.12305 34.1851 14.0859 46.0664 14.1416 46.1465 15.8164 47.8223 18.3945
+ 53.335 23.3774 53.335L106 53.335C109.676 53.335 112.666 50.3428 112.666 46.666L112.666 6.66699C112.666 2.99072 109.676 0 106 0L22.75 0Z">
+        <fill>
+          <LinearGradient x="56.3325" y="0" scaleX="57.0461" rotation="90">
+            <GradientEntry ratio="0" color="#FFFFFF" alpha="0.05"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/BeveledBackButton_fill.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/BeveledBackButton_fill.fxg
index bccb4d9..81d3387 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/BeveledBackButton_fill.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/BeveledBackButton_fill.fxg
@@ -18,17 +18,22 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="26" scaleGridRight="108" scaleGridTop="10" scaleGridBottom="46" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="0" width="116" height="56" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- chromeColor fill -->
-  <Path x="2" y="1.3335" winding="nonZero" data="M106 0C109.676 0 112.666 2.99121 112.666 6.66699L112.666 46.6675C112.666 50.3413 109.676 53.3335 106 53.3335L23.3784 53.3345C18.3945 53.3345 15.8164 47.8208 14.1416 46.1479 14.0869 46.0669 5.12305 34.1841 0 26.5215 5.12891 18.8438 14.1855 7.07715&#xD;&#xA; 14.2334 7.0083 17.2275 3.24561 19.084 0 23.3335 0L106 0 106 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#484848"/>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+	scaleGridLeft="26" scaleGridRight="108" scaleGridTop="10" scaleGridBottom="46">
+
+	<!-- invisible fix for scaling -->
+	<Rect x="0" y="0" width="116" height="56">
+		<fill>
+			<SolidColor color="#ffffff" alpha="0"/>
+		</fill>
+	</Rect>
+
+	<!-- chromeColor fill -->
+      <Path x="2" y="1.3335" winding="nonZero" data="M106 0C109.676 0 112.666 2.99121 112.666 6.66699L112.666 46.6675C112.666 50.3413 109.676 53.3335 106 53.3335L23.3784 53.3345C18.3945 53.3345 15.8164 47.8208 14.1416 46.1479 14.0869 46.0669 5.12305 34.1841 0 26.5215 5.12891 18.8438 14.1855 7.07715
+ 14.2334 7.0083 17.2275 3.24561 19.084 0 23.3335 0L106 0 106 0Z">
+        <fill>
+          <SolidColor color="#484848"/>
+        </fill>
+      </Path>
+
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/BeveledBackButton_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/BeveledBackButton_up.fxg
index 3590044..320f1ab 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/BeveledBackButton_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/BeveledBackButton_up.fxg
@@ -18,37 +18,48 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="26" scaleGridRight="108" scaleGridTop="10" scaleGridBottom="46" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="0" width="116" height="56" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- border -->
-  <Path winding="nonZero" data="M108 1.3335C111.676 1.3335 114.666 4.32373 114.666 8.00049L114.666 48.001C114.666 51.6748 111.676 54.667 108 54.667L25.3784 54.668C20.3945 54.668 17.8164 49.1543 16.1416 47.4814 16.0869 47.4004 7.12305 35.5176 2 27.855 7.12891 20.1772 16.1855&#xD;&#xA; 8.41064 16.2334 8.34082 19.2275 4.5791 21.084 1.3335 25.3335 1.3335L108 1.3335 108 1.3335ZM25.3335 0C19.8091 0 18.6865 2.55322 15.1445 7.57178 15.1445 7.57178 5.33301 19.9995 0 28 5.33301 36 15.0464 48.2393 15.0464 48.2393 19.0464 53.5732 20&#xD;&#xA; 56 25.3335 56L108 56C112.418 56 116 52.418 116 48.001L116 8.00049C116 3.58203 112.418 0 108 0L25.3335 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#323232"/>
-    </fill>
-  </Path>
-  <!-- shadow fill -->
-  <Path x="2" y="1.3335" winding="nonZero" data="M106 0C109.676 0 112.666 2.99121 112.666 6.66699L112.666 46.6675C112.666 50.3413 109.676 53.3335 106 53.3335L23.3784 53.3345C18.3945 53.3345 15.8164 47.8208 14.1416 46.1479 14.0869 46.0669 5.12305 34.1841 0 26.5215 5.12891 18.8438 14.1855 7.07715&#xD;&#xA; 14.2334 7.0083 17.2275 3.24561 19.3335 0 23.3335 0L106 0 106 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="56.3325" y="-1.04688" scaleX="54.1375" rotation="90">
-        <GradientEntry ratio="0" color="#FFFFFF" alpha="0.4"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- highlight border -->
-  <Path x="2" y="1.33252" winding="nonZero" data="M106 1.33252C108.94 1.33252 111.334 3.72412 111.334 6.6665L111.334 46.6665C111.334 49.6069 108.94 52.0015 106 52.0015L23.3784 52.0015C19.625 52.0015 15.0737 45.1274 15.0737 45.1274 11.7827 39.936 4.44189 30.7847 1.60254 26.5205 4.40576 22.3179&#xD;&#xA; 15.312 7.79346 15.312 7.79346 15.854 7.02002 19.6455 1.33252 23.3335 1.33252L106 1.33252ZM22.8955 0C19.167 0 16.417 4.26465 14.2334 7.00732 14.1855 7.07666 5.12891 18.8428 0 26.5205 5.12305 34.1846 14.0869 46.0669 14.1416 46.147 15.8164 47.8208&#xD;&#xA; 18.3945 53.3345 23.3784 53.3345L106 53.3345C109.676 53.3345 112.666 50.3423 112.666 46.6665L112.666 6.6665C112.666 2.99023 109.676 0 105.833 0L22.8955 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="56.3325" y="0" scaleX="53.335" rotation="90">
-        <GradientEntry ratio="0" alpha="0.35"/>
-        <GradientEntry ratio="0.662577" alpha="0.1"/>
-        <GradientEntry ratio="0.871166" color="#FFFFFF" alpha="0.05"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.2"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+	scaleGridLeft="26" scaleGridRight="108" scaleGridTop="10" scaleGridBottom="46">
+
+	<!-- invisible fix for scaling -->
+	<Rect x="0" y="0" width="116" height="56">
+		<fill>
+			<SolidColor color="#ffffff" alpha="0"/>
+		</fill>
+	</Rect>
+
+	<!-- border -->
+      <Path winding="nonZero" data="M108 1.3335C111.676 1.3335 114.666 4.32373 114.666 8.00049L114.666 48.001C114.666 51.6748 111.676 54.667 108 54.667L25.3784 54.668C20.3945 54.668 17.8164 49.1543 16.1416 47.4814 16.0869 47.4004 7.12305 35.5176 2 27.855 7.12891 20.1772 16.1855
+ 8.41064 16.2334 8.34082 19.2275 4.5791 21.084 1.3335 25.3335 1.3335L108 1.3335 108 1.3335ZM25.3335 0C19.8091 0 18.6865 2.55322 15.1445 7.57178 15.1445 7.57178 5.33301 19.9995 0 28 5.33301 36 15.0464 48.2393 15.0464 48.2393 19.0464 53.5732 20
+ 56 25.3335 56L108 56C112.418 56 116 52.418 116 48.001L116 8.00049C116 3.58203 112.418 0 108 0L25.3335 0Z">
+        <fill>
+          <SolidColor color="#323232"/>
+        </fill>
+      </Path>
+
+	<!-- shadow fill -->
+      <Path x="2" y="1.3335" winding="nonZero" data="M106 0C109.676 0 112.666 2.99121 112.666 6.66699L112.666 46.6675C112.666 50.3413 109.676 53.3335 106 53.3335L23.3784 53.3345C18.3945 53.3345 15.8164 47.8208 14.1416 46.1479 14.0869 46.0669 5.12305 34.1841 0 26.5215 5.12891 18.8438 14.1855 7.07715
+ 14.2334 7.0083 17.2275 3.24561 19.3335 0 23.3335 0L106 0 106 0Z">
+        <fill>
+          <LinearGradient x="56.3325" y="-1.04688" scaleX="54.1375" rotation="90">
+            <GradientEntry ratio="0" color="#FFFFFF" alpha="0.4"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+
+	<!-- highlight border -->
+      <Path x="2" y="1.33252" winding="nonZero" data="M106 1.33252C108.94 1.33252 111.334 3.72412 111.334 6.6665L111.334 46.6665C111.334 49.6069 108.94 52.0015 106 52.0015L23.3784 52.0015C19.625 52.0015 15.0737 45.1274 15.0737 45.1274 11.7827 39.936 4.44189 30.7847 1.60254 26.5205 4.40576 22.3179
+ 15.312 7.79346 15.312 7.79346 15.854 7.02002 19.6455 1.33252 23.3335 1.33252L106 1.33252ZM22.8955 0C19.167 0 16.417 4.26465 14.2334 7.00732 14.1855 7.07666 5.12891 18.8428 0 26.5205 5.12305 34.1846 14.0869 46.0669 14.1416 46.147 15.8164 47.8208
+ 18.3945 53.3345 23.3784 53.3345L106 53.3345C109.676 53.3345 112.666 50.3423 112.666 46.6665L112.666 6.6665C112.666 2.99023 109.676 0 105.833 0L22.8955 0Z">
+        <fill>
+          <LinearGradient x="56.3325" y="0" scaleX="53.335" rotation="90">
+            <GradientEntry ratio="0" alpha="0.35"/>
+            <GradientEntry ratio="0.662577" alpha="0.1"/>
+            <GradientEntry ratio="0.871166" color="#FFFFFF" alpha="0.05"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.2"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarFirstButton_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarFirstButton_down.fxg
index 3cb0dfa..c2e73e8 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarFirstButton_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarFirstButton_down.fxg
@@ -18,32 +18,40 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="12" scaleGridTop="12" scaleGridRight="152" scaleGridBottom="78" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- shadow fill -->
-  <Path data="M160 80 10.7554 80C4.81641 80 0 75.1436 0 69.1533L0 10.8472C0 4.85693 4.81641 0 10.7554 0L160 0 160 80Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="79.9995" y="1.37939" scaleX="77.3718" rotation="90">
-        <GradientEntry ratio="0" alpha="0.14902"/>
-        <GradientEntry ratio="1" alpha="0.34902"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- border -->
-  <Path winding="nonZero" data="M158.655 1.35596 158.655 78.6445 10.7554 78.6445C5.56641 78.6445 1.34521 74.3857 1.34521 69.1533L1.34521 10.8472C1.34521 5.61377 5.56641 1.35596 10.7554 1.35596L158.655 1.35596ZM160 0 10.7554 0C4.81641 0 0 4.85693 0 10.8472L0 69.1533C0 75.1436&#xD;&#xA; 4.81641 80 10.7554 80L160 80 160 0 160 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#464646"/>
-    </fill>
-  </Path>
-  <!-- outer shadow -->
-  <Path x="1.3335" y="1.35986" winding="nonZero" data="M155.967 1.35547 155.967 75.9321 9.41113 75.9321C4.96338 75.9321 1.34473 72.2837 1.34473 67.7974L1.34473 9.49121C1.34473 5.00488 4.96338 1.35547 9.41113 1.35547L155.967 1.35547ZM157.311 0 9.41113 0C4.22119 0 0 4.25684 0 9.49121L0 67.7974C0 73.0308&#xD;&#xA; 4.22119 77.2886 9.41113 77.2886L157.311 77.2886 157.311 0 157.311 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor alpha="0.2"/>
-    </fill>
-  </Path>
-  <!-- inner shadow -->
-  <Path x="2.68896" y="2.71143" winding="nonZero" data="M153.299 1.3335 153.289 73.2427 8.06641 73.2427C4.35352 73.2427 1.33301 70.1919 1.33301 66.4419L1.33301 8.13574C1.33301 4.38477 4.35352 1.3335 8.06641 1.3335L153.299 1.3335ZM154.632 0 154.623 0 8.06641 0C3.61816 0 0 3.64941 0 8.13574L0 66.4419&#xD;&#xA;C0 70.9282 3.61816 74.5767 8.06641 74.5767L154.623 74.5767 154.632 0 154.632 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor alpha="0.1"/>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="12" scaleGridTop="12" scaleGridRight="152" scaleGridBottom="78">
+    
+      <!-- shadow fill -->
+      <Path data="M160 80 10.7554 80C4.81641 80 0 75.1436 0 69.1533L0 10.8472C0 4.85693 4.81641 0 10.7554 0L160 0 160 80Z">
+        <fill>
+          <LinearGradient x="79.9995" y="1.37939" scaleX="77.3718" rotation="90">
+            <GradientEntry ratio="0" alpha="0.14902"/>
+            <GradientEntry ratio="1" alpha="0.34902"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      
+      <!-- border -->
+      <Path winding="nonZero" data="M158.655 1.35596 158.655 78.6445 10.7554 78.6445C5.56641 78.6445 1.34521 74.3857 1.34521 69.1533L1.34521 10.8472C1.34521 5.61377 5.56641 1.35596 10.7554 1.35596L158.655 1.35596ZM160 0 10.7554 0C4.81641 0 0 4.85693 0 10.8472L0 69.1533C0 75.1436
+ 4.81641 80 10.7554 80L160 80 160 0 160 0Z">
+        <fill>
+          <SolidColor color="#464646"/>
+        </fill>
+      </Path>
+      
+      <!-- outer shadow -->
+      <Path x="1.3335" y="1.35986" winding="nonZero" data="M155.967 1.35547 155.967 75.9321 9.41113 75.9321C4.96338 75.9321 1.34473 72.2837 1.34473 67.7974L1.34473 9.49121C1.34473 5.00488 4.96338 1.35547 9.41113 1.35547L155.967 1.35547ZM157.311 0 9.41113 0C4.22119 0 0 4.25684 0 9.49121L0 67.7974C0 73.0308
+ 4.22119 77.2886 9.41113 77.2886L157.311 77.2886 157.311 0 157.311 0Z">
+        <fill>
+          <SolidColor alpha="0.2"/>
+        </fill>
+      </Path>
+      
+      <!-- inner shadow -->
+      <Path x="2.68896" y="2.71143" winding="nonZero" data="M153.299 1.3335 153.289 73.2427 8.06641 73.2427C4.35352 73.2427 1.33301 70.1919 1.33301 66.4419L1.33301 8.13574C1.33301 4.38477 4.35352 1.3335 8.06641 1.3335L153.299 1.3335ZM154.632 0 154.623 0 8.06641 0C3.61816 0 0 3.64941 0 8.13574L0 66.4419
+C0 70.9282 3.61816 74.5767 8.06641 74.5767L154.623 74.5767 154.632 0 154.632 0Z">
+        <fill>
+          <SolidColor alpha="0.1"/>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarFirstButton_selected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarFirstButton_selected.fxg
index 33a7fb0..830c381 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarFirstButton_selected.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarFirstButton_selected.fxg
@@ -18,32 +18,40 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="12" scaleGridTop="12" scaleGridRight="152" scaleGridBottom="78" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- shadow fill -->
-  <Path data="M160 80 10.7554 80C4.81641 80 0 75.1436 0 69.1533L0 10.8462C0 4.85693 4.81641 0 10.7554 0L160 0 160 80Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="79.9995" y="1.37939" scaleX="77.3718" rotation="90">
-        <GradientEntry ratio="0" alpha="0.047059"/>
-        <GradientEntry ratio="1" alpha="0.247059"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- border -->
-  <Path winding="nonZero" data="M158.655 1.35693 158.655 78.6445 10.7554 78.6445C5.56641 78.6445 1.34521 74.3857 1.34521 69.1533L1.34521 10.8462C1.34521 5.61475 5.56641 1.35693 10.7554 1.35693L158.655 1.35693ZM160 0 10.7554 0C4.81641 0 0 4.85693 0 10.8462L0 69.1533C0 75.1436&#xD;&#xA; 4.81641 80 10.7554 80L160 80 160 0 160 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#646464"/>
-    </fill>
-  </Path>
-  <!-- outer shadow -->
-  <Path x="1.3335" y="1.35938" winding="nonZero" data="M155.967 1.35693 155.967 75.9326 9.41113 75.9326C4.96338 75.9326 1.34473 72.2842 1.34473 67.7979L1.34473 9.49219C1.34473 5.00537 4.96338 1.35693 9.41113 1.35693L155.967 1.35693ZM157.311 0 9.41113 0C4.22119 0 0 4.25781 0 9.49219L0 67.7979C0 73.0312&#xD;&#xA; 4.22119 77.2891 9.41113 77.2891L157.311 77.2891 157.311 0 157.311 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor alpha="0.2"/>
-    </fill>
-  </Path>
-  <!-- inner shadow -->
-  <Path x="2.68896" y="2.71094" winding="nonZero" data="M153.299 1.3335 153.289 73.2432 8.06641 73.2432C4.35352 73.2432 1.33301 70.1924 1.33301 66.4424L1.33301 8.13525C1.33301 4.38477 4.35352 1.3335 8.06641 1.3335L153.299 1.3335ZM154.632 0 8.06641 0C3.61816 0 0 3.6499 0 8.13525L0 66.4424C0 70.9287&#xD;&#xA; 3.61816 74.5771 8.06641 74.5771L154.623 74.5771 154.632 0 154.632 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor alpha="0.1"/>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="12" scaleGridTop="12" scaleGridRight="152" scaleGridBottom="78">
+    
+      <!-- shadow fill -->
+      <Path data="M160 80 10.7554 80C4.81641 80 0 75.1436 0 69.1533L0 10.8462C0 4.85693 4.81641 0 10.7554 0L160 0 160 80Z">
+        <fill>
+          <LinearGradient x="79.9995" y="1.37939" scaleX="77.3718" rotation="90">
+            <GradientEntry ratio="0" alpha="0.047059"/>
+            <GradientEntry ratio="1" alpha="0.247059"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      
+      <!-- border -->
+      <Path winding="nonZero" data="M158.655 1.35693 158.655 78.6445 10.7554 78.6445C5.56641 78.6445 1.34521 74.3857 1.34521 69.1533L1.34521 10.8462C1.34521 5.61475 5.56641 1.35693 10.7554 1.35693L158.655 1.35693ZM160 0 10.7554 0C4.81641 0 0 4.85693 0 10.8462L0 69.1533C0 75.1436
+ 4.81641 80 10.7554 80L160 80 160 0 160 0Z">
+        <fill>
+          <SolidColor color="#646464"/>
+        </fill>
+      </Path>
+      
+      <!-- outer shadow -->
+      <Path x="1.3335" y="1.35938" winding="nonZero" data="M155.967 1.35693 155.967 75.9326 9.41113 75.9326C4.96338 75.9326 1.34473 72.2842 1.34473 67.7979L1.34473 9.49219C1.34473 5.00537 4.96338 1.35693 9.41113 1.35693L155.967 1.35693ZM157.311 0 9.41113 0C4.22119 0 0 4.25781 0 9.49219L0 67.7979C0 73.0312
+ 4.22119 77.2891 9.41113 77.2891L157.311 77.2891 157.311 0 157.311 0Z">
+        <fill>
+          <SolidColor alpha="0.2"/>
+        </fill>
+      </Path>
+      
+      <!-- inner shadow -->
+      <Path x="2.68896" y="2.71094" winding="nonZero" data="M153.299 1.3335 153.289 73.2432 8.06641 73.2432C4.35352 73.2432 1.33301 70.1924 1.33301 66.4424L1.33301 8.13525C1.33301 4.38477 4.35352 1.3335 8.06641 1.3335L153.299 1.3335ZM154.632 0 8.06641 0C3.61816 0 0 3.6499 0 8.13525L0 66.4424C0 70.9287
+ 3.61816 74.5771 8.06641 74.5771L154.623 74.5771 154.632 0 154.632 0Z">
+        <fill>
+          <SolidColor alpha="0.1"/>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarFirstButton_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarFirstButton_up.fxg
index 92d11b1..864eac3 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarFirstButton_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarFirstButton_up.fxg
@@ -18,26 +18,31 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="12" scaleGridTop="12" scaleGridRight="152" scaleGridBottom="78" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- highlight fill -->
-  <Path data="M160 80 10.5781 80C4.73682 80 0 75.3018 0 69.5078L0 10.4917C0 4.69727 4.73682 0 10.5781 0L160 0 160 80Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="79.9995" y="0.689453" scaleX="42.9587" rotation="90">
-        <GradientEntry ratio="0" color="#FFFFFF" alpha="0.698039"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.047059"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- border -->
-  <Path winding="nonZero" data="M158.677 1.31104 158.677 78.6885 10.5781 78.6885C5.4751 78.6885 1.32275 74.5703 1.32275 69.5078L1.32275 10.4917C1.32275 5.42969 5.4751 1.31104 10.5781 1.31104L158.677 1.31104ZM160 0 10.5781 0C4.73682 0 0 4.69727 0 10.4917L0 69.5078C0 75.3018 4.73682&#xD;&#xA; 80 10.5781 80L160 80 160 0 160 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#646464"/>
-    </fill>
-  </Path>
-  <!-- right separator highlight -->
-  <Rect x="157.333" y="1.3335" width="1.33398" height="77.3335" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#FFFFFF" alpha="0.2"/>
-    </fill>
-  </Rect>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="12" scaleGridTop="12" scaleGridRight="152" scaleGridBottom="78">
+    
+      <!-- highlight fill -->
+      <Path data="M160 80 10.5781 80C4.73682 80 0 75.3018 0 69.5078L0 10.4917C0 4.69727 4.73682 0 10.5781 0L160 0 160 80Z">
+        <fill>
+          <LinearGradient x="79.9995" y="0.689453" scaleX="42.9587" rotation="90">
+            <GradientEntry ratio="0" color="#FFFFFF" alpha="0.698039"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.047059"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      
+      <!-- border -->
+      <Path winding="nonZero" data="M158.677 1.31104 158.677 78.6885 10.5781 78.6885C5.4751 78.6885 1.32275 74.5703 1.32275 69.5078L1.32275 10.4917C1.32275 5.42969 5.4751 1.31104 10.5781 1.31104L158.677 1.31104ZM160 0 10.5781 0C4.73682 0 0 4.69727 0 10.4917L0 69.5078C0 75.3018 4.73682
+ 80 10.5781 80L160 80 160 0 160 0Z">
+        <fill>
+          <SolidColor color="#646464"/>
+        </fill>
+      </Path>
+      
+      <!-- right separator highlight -->
+      <Rect x="157.333" y="1.3335" width="1.33398" height="77.3335">
+        <fill>
+          <SolidColor color="#FFFFFF" alpha="0.2"/>
+        </fill>
+      </Rect>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarLastButton_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarLastButton_down.fxg
index 25d34e1..8b303b8 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarLastButton_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarLastButton_down.fxg
@@ -18,32 +18,40 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="8" scaleGridTop="12" scaleGridRight="148" scaleGridBottom="68" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- shadow fill -->
-  <Path data="M0 0 149.245 0C155.184 0 160 4.85693 160 10.8472L160 69.1533C160 75.1436 155.184 80 149.245 80L0 80 0 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="79.9995" y="1.37939" scaleX="77.3705" rotation="90">
-        <GradientEntry ratio="0" alpha="0.14902"/>
-        <GradientEntry ratio="1" alpha="0.34902"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- outer shadow -->
-  <Path y="1.35986" winding="nonZero" data="M1.3335 1.35547 149.255 1.35547C153.703 1.35547 157.321 5.00488 157.321 9.49121L157.321 67.7974C157.321 72.2837 153.703 75.9321 149.255 75.9321L1.3335 75.9321M0 0 0 77.2886 149.255 77.2886C154.445 77.2886 158.667 73.0308 158.667 67.7974L158.667&#xD;&#xA; 9.49121C158.667 4.25684 154.445 0 149.255 0L0 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor alpha="0.2"/>
-    </fill>
-  </Path>
-  <!-- inner shadow -->
-  <Path x="1.3335" y="2.71143" winding="nonZero" data="M147.912 1.3335C151.624 1.3335 154.644 4.38477 154.644 8.13574L154.644 66.4419C154.644 70.1919 151.624 73.2427 147.912 73.2427L1.33301 73.2427 1.33301 1.3335 147.912 1.3335ZM147.912 0 0 0 0 74.5767 147.912 74.5767C152.359 74.5767 155.978 70.9282&#xD;&#xA; 155.978 66.4419L155.978 8.13574C155.978 3.64941 152.359 0 147.912 0L147.912 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor alpha="0.1"/>
-    </fill>
-  </Path>
-  <!-- border -->
-  <Path winding="nonZero" data="M149.422 0 0 0 0 1.31104 149.422 1.31104C154.524 1.31104 158.677 5.42969 158.677 10.4917L158.677 69.5078C158.677 74.5703 154.524 78.6885 149.422 78.6885L0 78.6885 0 80 149.422 80C155.263 80 160 75.3018 160 69.5078L160 10.4917C160 4.69727 155.263&#xD;&#xA; 0 149.422 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#464646"/>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="8" scaleGridTop="12" scaleGridRight="148" scaleGridBottom="68">
+    
+      <!-- shadow fill -->
+      <Path data="M0 0 149.245 0C155.184 0 160 4.85693 160 10.8472L160 69.1533C160 75.1436 155.184 80 149.245 80L0 80 0 0Z">
+        <fill>
+          <LinearGradient x="79.9995" y="1.37939" scaleX="77.3705" rotation="90">
+            <GradientEntry ratio="0" alpha="0.14902"/>
+            <GradientEntry ratio="1" alpha="0.34902"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      
+      <!-- outer shadow -->
+      <Path y="1.35986" winding="nonZero" data="M1.3335 1.35547 149.255 1.35547C153.703 1.35547 157.321 5.00488 157.321 9.49121L157.321 67.7974C157.321 72.2837 153.703 75.9321 149.255 75.9321L1.3335 75.9321M0 0 0 77.2886 149.255 77.2886C154.445 77.2886 158.667 73.0308 158.667 67.7974L158.667
+ 9.49121C158.667 4.25684 154.445 0 149.255 0L0 0Z">
+        <fill>
+          <SolidColor alpha="0.2"/>
+        </fill>
+      </Path>
+      
+      <!-- inner shadow -->
+      <Path x="1.3335" y="2.71143" winding="nonZero" data="M147.912 1.3335C151.624 1.3335 154.644 4.38477 154.644 8.13574L154.644 66.4419C154.644 70.1919 151.624 73.2427 147.912 73.2427L1.33301 73.2427 1.33301 1.3335 147.912 1.3335ZM147.912 0 0 0 0 74.5767 147.912 74.5767C152.359 74.5767 155.978 70.9282
+ 155.978 66.4419L155.978 8.13574C155.978 3.64941 152.359 0 147.912 0L147.912 0Z">
+        <fill>
+          <SolidColor alpha="0.1"/>
+        </fill>
+      </Path>
+      
+      <!-- border -->
+      <Path winding="nonZero" data="M149.422 0 0 0 0 1.31104 149.422 1.31104C154.524 1.31104 158.677 5.42969 158.677 10.4917L158.677 69.5078C158.677 74.5703 154.524 78.6885 149.422 78.6885L0 78.6885 0 80 149.422 80C155.263 80 160 75.3018 160 69.5078L160 10.4917C160 4.69727 155.263
+ 0 149.422 0Z">
+        <fill>
+          <SolidColor color="#464646"/>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarLastButton_selected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarLastButton_selected.fxg
index acaea37..61e486a 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarLastButton_selected.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarLastButton_selected.fxg
@@ -18,32 +18,40 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="8" scaleGridTop="12" scaleGridRight="148" scaleGridBottom="68" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- shadow fill -->
-  <Path data="M0 0 149.245 0C155.184 0 160 4.85693 160 10.8462L160 69.1533C160 75.1436 155.184 80 149.245 80L0 80 0 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="79.9995" y="1.37939" scaleX="77.3705" rotation="90">
-        <GradientEntry ratio="0" alpha="0.047059"/>
-        <GradientEntry ratio="1" alpha="0.247059"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- outer shadow -->
-  <Path y="1.35938" winding="nonZero" data="M1.34375 1.35693 149.255 1.35693C153.703 1.35693 157.321 5.00537 157.321 9.49219L157.321 67.7979C157.321 72.2842 153.703 75.9326 149.255 75.9326L1.34375 75.9326 1.34375 1.35693ZM0 77.2891 149.255 77.2891C154.445 77.2891 158.667 73.0312 158.667&#xD;&#xA; 67.7979L158.667 9.49219C158.667 4.25781 154.445 0 149.255 0L0 0 0 77.2891Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor alpha="0.2"/>
-    </fill>
-  </Path>
-  <!-- inner shadow -->
-  <Path x="1.32275" y="2.71094" winding="nonZero" data="M147.922 1.3335C151.634 1.3335 154.655 4.38477 154.655 8.13525L154.655 66.4424C154.655 70.1924 151.634 73.2432 147.922 73.2432L1.34375 73.2432 1.3335 1.3335 147.922 1.3335ZM147.922 0 0 0 0.0107422 74.5771 147.922 74.5771C152.37 74.5771 155.989&#xD;&#xA; 70.9287 155.989 66.4424L155.989 8.13525C155.989 3.6499 152.37 0 147.922 0L147.922 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor alpha="0.1"/>
-    </fill>
-  </Path>
-  <!-- border -->
-  <Path winding="nonZero" data="M149.422 0 0 0 0 1.31104 149.422 1.31104C154.524 1.31104 158.677 5.42969 158.677 10.4922L158.677 69.5078C158.677 74.5703 154.524 78.6885 149.422 78.6885L0 78.6885 0 80 149.422 80C155.263 80 160 75.3018 160 69.5078L160 10.4922C160 4.69775 155.263&#xD;&#xA; 0 149.422 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#646464"/>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="8" scaleGridTop="12" scaleGridRight="148" scaleGridBottom="68">
+    
+      <!-- shadow fill -->
+      <Path data="M0 0 149.245 0C155.184 0 160 4.85693 160 10.8462L160 69.1533C160 75.1436 155.184 80 149.245 80L0 80 0 0Z">
+        <fill>
+          <LinearGradient x="79.9995" y="1.37939" scaleX="77.3705" rotation="90">
+            <GradientEntry ratio="0" alpha="0.047059"/>
+            <GradientEntry ratio="1" alpha="0.247059"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      
+      <!-- outer shadow -->
+      <Path y="1.35938" winding="nonZero" data="M1.34375 1.35693 149.255 1.35693C153.703 1.35693 157.321 5.00537 157.321 9.49219L157.321 67.7979C157.321 72.2842 153.703 75.9326 149.255 75.9326L1.34375 75.9326 1.34375 1.35693ZM0 77.2891 149.255 77.2891C154.445 77.2891 158.667 73.0312 158.667
+ 67.7979L158.667 9.49219C158.667 4.25781 154.445 0 149.255 0L0 0 0 77.2891Z">
+        <fill>
+          <SolidColor alpha="0.2"/>
+        </fill>
+      </Path>
+      
+      <!-- inner shadow -->
+      <Path x="1.32275" y="2.71094" winding="nonZero" data="M147.922 1.3335C151.634 1.3335 154.655 4.38477 154.655 8.13525L154.655 66.4424C154.655 70.1924 151.634 73.2432 147.922 73.2432L1.34375 73.2432 1.3335 1.3335 147.922 1.3335ZM147.922 0 0 0 0.0107422 74.5771 147.922 74.5771C152.37 74.5771 155.989
+ 70.9287 155.989 66.4424L155.989 8.13525C155.989 3.6499 152.37 0 147.922 0L147.922 0Z">
+        <fill>
+          <SolidColor alpha="0.1"/>
+        </fill>
+      </Path>
+      
+      <!-- border -->
+      <Path winding="nonZero" data="M149.422 0 0 0 0 1.31104 149.422 1.31104C154.524 1.31104 158.677 5.42969 158.677 10.4922L158.677 69.5078C158.677 74.5703 154.524 78.6885 149.422 78.6885L0 78.6885 0 80 149.422 80C155.263 80 160 75.3018 160 69.5078L160 10.4922C160 4.69775 155.263
+ 0 149.422 0Z">
+        <fill>
+          <SolidColor color="#646464"/>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarLastButton_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarLastButton_up.fxg
index 89ca413..7d77bc2 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarLastButton_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarLastButton_up.fxg
@@ -18,26 +18,31 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="8" scaleGridTop="12" scaleGridRight="148" scaleGridBottom="68" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- highlight fill -->
-  <Path data="M0 0 149.422 0C155.263 0 160 4.69727 160 10.4917L160 69.5078C160 75.3018 155.263 80 149.422 80L0 80 0 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="79.9995" y="0.689453" scaleX="42.9579" rotation="90">
-        <GradientEntry ratio="0" color="#FFFFFF" alpha="0.698039"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.047059"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- left separator highlight -->
-  <Rect y="1.3335" width="1.3335" height="77.3335" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#FFFFFF" alpha="0.2"/>
-    </fill>
-  </Rect>
-  <!-- border -->
-  <Path winding="nonZero" data="M149.422 0 0 0 0 1.31104 149.422 1.31104C154.524 1.31104 158.677 5.42969 158.677 10.4917L158.677 69.5078C158.677 74.5703 154.524 78.6885 149.422 78.6885L0 78.6885 0 80 149.422 80C155.263 80 160 75.3018 160 69.5078L160 10.4917C160 4.69727 155.263&#xD;&#xA; 0 149.422 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#646464"/>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="8" scaleGridTop="12" scaleGridRight="148" scaleGridBottom="68">
+    
+      <!-- highlight fill -->
+      <Path data="M0 0 149.422 0C155.263 0 160 4.69727 160 10.4917L160 69.5078C160 75.3018 155.263 80 149.422 80L0 80 0 0Z">
+        <fill>
+          <LinearGradient x="79.9995" y="0.689453" scaleX="42.9579" rotation="90">
+            <GradientEntry ratio="0" color="#FFFFFF" alpha="0.698039"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.047059"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      
+      <!-- left separator highlight -->
+      <Rect y="1.3335" width="1.3335" height="77.3335">
+        <fill>
+          <SolidColor color="#FFFFFF" alpha="0.2"/>
+        </fill>
+      </Rect>
+      
+      <!-- border -->
+      <Path winding="nonZero" data="M149.422 0 0 0 0 1.31104 149.422 1.31104C154.524 1.31104 158.677 5.42969 158.677 10.4917L158.677 69.5078C158.677 74.5703 154.524 78.6885 149.422 78.6885L0 78.6885 0 80 149.422 80C155.263 80 160 75.3018 160 69.5078L160 10.4917C160 4.69727 155.263
+ 0 149.422 0Z">
+        <fill>
+          <SolidColor color="#646464"/>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarMiddleButton_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarMiddleButton_down.fxg
index cf3911a..c6ace14 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarMiddleButton_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarMiddleButton_down.fxg
@@ -18,32 +18,37 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="8" scaleGridTop="8" scaleGridRight="152" scaleGridBottom="72" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- shadow fill -->
-  <Rect width="160" height="80" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="79.9995" y="1.37939" scaleX="77.3705" rotation="90">
-        <GradientEntry ratio="0" alpha="0.14902"/>
-        <GradientEntry ratio="1" alpha="0.34902"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- outer shadow -->
-  <Path y="1.3335" winding="nonZero" data="M1.3335 1.33301 157.333 1.33301 157.333 75.9995 1.3335 75.9995 1.3335 1.33301ZM0 0.0449219 0 77.3335 158.667 77.3335 158.667 0 0 0.0449219Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor alpha="0.2"/>
-    </fill>
-  </Path>
-  <!-- inner shadow -->
-  <Path x="1.3335" y="2.6665" winding="nonZero" data="M154.667 1.3335 154.667 73.3335 1.33301 73.3335 1.33301 1.3335 154.667 1.3335ZM156 0 0 0 0 74.6665 156 74.6665 156 0 156 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor alpha="0.1"/>
-    </fill>
-  </Path>
-  <!-- border -->
-  <Path winding="nonZero" data="M0 0 0 1.3335 158.667 1.3335 158.667 78.667 0 78.667 0 80 160 80 160 0 0 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#464646"/>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="8" scaleGridTop="8" scaleGridRight="152" scaleGridBottom="72">
+    
+      <!-- shadow fill -->
+      <Rect width="160" height="80">
+        <fill>
+          <LinearGradient x="79.9995" y="1.37939" scaleX="77.3705" rotation="90">
+            <GradientEntry ratio="0" alpha="0.14902"/>
+            <GradientEntry ratio="1" alpha="0.34902"/>
+          </LinearGradient>
+        </fill>
+      </Rect>
+      
+      <!-- outer shadow -->
+      <Path y="1.3335" winding="nonZero" data="M1.3335 1.33301 157.333 1.33301 157.333 75.9995 1.3335 75.9995 1.3335 1.33301ZM0 0.0449219 0 77.3335 158.667 77.3335 158.667 0 0 0.0449219Z">
+        <fill>
+          <SolidColor alpha="0.2"/>
+        </fill>
+      </Path>
+      
+      <!-- inner shadow -->
+      <Path x="1.3335" y="2.6665" winding="nonZero" data="M154.667 1.3335 154.667 73.3335 1.33301 73.3335 1.33301 1.3335 154.667 1.3335ZM156 0 0 0 0 74.6665 156 74.6665 156 0 156 0Z">
+        <fill>
+          <SolidColor alpha="0.1"/>
+        </fill>
+      </Path>
+      
+      <!-- border -->
+      <Path winding="nonZero" data="M0 0 0 1.3335 158.667 1.3335 158.667 78.667 0 78.667 0 80 160 80 160 0 0 0Z">
+        <fill>
+          <SolidColor color="#464646"/>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarMiddleButton_selected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarMiddleButton_selected.fxg
index cac72bb..aad6c68 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarMiddleButton_selected.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarMiddleButton_selected.fxg
@@ -18,32 +18,37 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="8" scaleGridTop="8" scaleGridRight="152" scaleGridBottom="72" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- shadow fill -->
-  <Rect y="1.3335" width="158.667" height="77.3335" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="79.3335" y="1.3335" scaleX="74.7917" rotation="90">
-        <GradientEntry ratio="0" alpha="0.047059"/>
-        <GradientEntry ratio="1" alpha="0.247059"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- outer shadow -->
-  <Path y="1.3335" winding="nonZero" data="M1.3335 1.33301 157.333 1.33301 157.333 75.9995 1.3335 75.9995 1.3335 1.33301ZM0 0.0439453 0 77.3335 158.667 77.3335 158.667 0 0 0.0439453 0 0.0439453Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor alpha="0.2"/>
-    </fill>
-  </Path>
-  <!-- inner shadow -->
-  <Path x="1.32275" y="2.6665" winding="nonZero" data="M154.677 1.3335 154.677 73.3335 1.34375 73.3335 1.3335 1.3335 154.677 1.3335ZM156.01 0 0 0 0.0107422 74.6665 156.01 74.6665 156.01 0 156.01 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor alpha="0.1"/>
-    </fill>
-  </Path>
-  <!-- border -->
-  <Path winding="nonZero" data="M0 0 0 1.3335 158.667 1.3335 158.667 78.667 0 78.667 0 80 160 80 160 0 0 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#646464"/>
-    </fill>
-  </Path>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="8" scaleGridTop="8" scaleGridRight="152" scaleGridBottom="72">
+    
+      <!-- shadow fill -->
+      <Rect y="1.3335" width="158.667" height="77.3335">
+        <fill>
+          <LinearGradient x="79.3335" y="1.3335" scaleX="74.7917" rotation="90">
+            <GradientEntry ratio="0" alpha="0.047059"/>
+            <GradientEntry ratio="1" alpha="0.247059"/>
+          </LinearGradient>
+        </fill>
+      </Rect>
+      
+      <!-- outer shadow -->
+      <Path y="1.3335" winding="nonZero" data="M1.3335 1.33301 157.333 1.33301 157.333 75.9995 1.3335 75.9995 1.3335 1.33301ZM0 0.0439453 0 77.3335 158.667 77.3335 158.667 0 0 0.0439453 0 0.0439453Z">
+        <fill>
+          <SolidColor alpha="0.2"/>
+        </fill>
+      </Path>
+      
+      <!-- inner shadow -->
+      <Path x="1.32275" y="2.6665" winding="nonZero" data="M154.677 1.3335 154.677 73.3335 1.34375 73.3335 1.3335 1.3335 154.677 1.3335ZM156.01 0 0 0 0.0107422 74.6665 156.01 74.6665 156.01 0 156.01 0Z">
+        <fill>
+          <SolidColor alpha="0.1"/>
+        </fill>
+      </Path>
+      
+      <!-- border -->
+      <Path winding="nonZero" data="M0 0 0 1.3335 158.667 1.3335 158.667 78.667 0 78.667 0 80 160 80 160 0 0 0Z">
+        <fill>
+          <SolidColor color="#646464"/>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarMiddleButton_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarMiddleButton_up.fxg
index 12d157f..840b767 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarMiddleButton_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ButtonBarMiddleButton_up.fxg
@@ -18,32 +18,37 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="8" scaleGridTop="8" scaleGridRight="152" scaleGridBottom="72" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- highlight fill -->
-  <Rect width="160" height="80" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="79.9995" y="0.689453" scaleX="42.9579" rotation="90">
-        <GradientEntry ratio="0" color="#FFFFFF" alpha="0.698039"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.047059"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- border -->
-  <Path winding="nonZero" data="M0 0 0 1.3335 158.667 1.3335 158.667 78.667 0 78.667 0 80 160 80 160 0 0 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#646464"/>
-    </fill>
-  </Path>
-  <!-- left separator highlight -->
-  <Rect y="1.3335" width="1.3335" height="77.3335" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#FFFFFF" alpha="0.2"/>
-    </fill>
-  </Rect>
-  <!-- right separator highlight -->
-  <Rect x="157.333" y="1.3335" width="1.33398" height="77.3335" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#FFFFFF" alpha="0.2"/>
-    </fill>
-  </Rect>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridLeft="8" scaleGridTop="8" scaleGridRight="152" scaleGridBottom="72">
+    
+      <!-- highlight fill -->
+      <Rect width="160" height="80">
+        <fill>
+          <LinearGradient x="79.9995" y="0.689453" scaleX="42.9579" rotation="90">
+            <GradientEntry ratio="0" color="#FFFFFF" alpha="0.698039"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.047059"/>
+          </LinearGradient>
+        </fill>
+      </Rect>
+      
+      <!-- border -->
+      <Path winding="nonZero" data="M0 0 0 1.3335 158.667 1.3335 158.667 78.667 0 78.667 0 80 160 80 160 0 0 0Z">
+        <fill>
+          <SolidColor color="#646464"/>
+        </fill>
+      </Path>
+      
+      <!-- left separator highlight -->
+      <Rect y="1.3335" width="1.3335" height="77.3335">
+        <fill>
+          <SolidColor color="#FFFFFF" alpha="0.2"/>
+        </fill>
+      </Rect>
+      
+      <!-- right separator highlight -->
+      <Rect x="157.333" y="1.3335" width="1.33398" height="77.3335">
+        <fill>
+          <SolidColor color="#FFFFFF" alpha="0.2"/>
+        </fill>
+      </Rect>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/Button_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/Button_down.fxg
index 51d940c..1d079c2 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/Button_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/Button_down.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,32 +18,34 @@
 
 -->
 
-<Graphic version="2.0" viewHeight="86" viewWidth="292" scaleGridLeft="20" scaleGridRight="272" scaleGridTop="20" scaleGridBottom="66" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- Border -->
-  <Path data="M12 2 280 2C286 2 290 6 290 12L290 74C290 80 286 84 280 84L12 84C6 84 2 80 2 74L2 12C2 6 6 2 12 2ZM12 0C6 0 0 6 0 12L0 74C0 80 6 86 12 86L280 86C286 86 292 80 292 74L292 12C292 6 286 0 280 0L12 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#464646"/>
-    </fill>
-  </Path>
-  <!-- Fill Shadow -->
-  <Path x="2" y="2" data="M10 0 278 0C284 0 288 4 288 10L288 72C288 78 284 82 278 82L10 82C4 82 0 78 0 72L0 10C0 4 4 0 10 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="144" y="0" scaleX="82.0005" rotation="90">
-        <GradientEntry ratio="0" alpha="0.05"/>
-        <GradientEntry ratio="1" alpha="0.25"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <!-- Inner Shadow -->
-  <Path x="2" y="2" data="M2 10C2 6 6 2 10 2L278 2C282 2 286 6 286 10L286 72C286 76 282 80 278 80L10 80C6 80 2 76 2 72L2 10ZM10 0C4 0 0 4 0 10L0 72C0 78 4 82 10 82L278 82C284 82 288 78 288 72L288 10C288 4 284 0 278 0L10 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor alpha="0.2"/>
-    </fill>
-  </Path>
-  <!-- Inner Inner Shadow -->
-  <Path x="4" y="4" data="M2 8C2 4 4 2 8 2L276 2C280 2 282 4 282 8L282 70C282 74 280 76 276 76L8 76C4 76 2 74 2 70L2 8ZM0 8 0 70C0 74 4 78 8 78L276 78C280 78 284 74 284 70L284 8C284 4 280 0 276 0L8 0C4 0 0 4 0 8Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#646464" alpha="0.1"/>
-    </fill>
-  </Path>
+
+<Graphic version="2.0" viewHeight="86" viewWidth="292" xmlns="http://ns.adobe.com/fxg/2008"
+	scaleGridLeft="20" scaleGridRight="272" scaleGridTop="20" scaleGridBottom="66">
+  	<!-- Border --> 
+	<Path data="M12 2 280 2C286 2 290 6 290 12L290 74C290 80 286 84 280 84L12 84C6 84 2 80 2 74L2 12C2 6 6 2 12 2ZM12 0C6 0 0 6 0 12L0 74C0 80 6 86 12 86L280 86C286 86 292 80 292 74L292 12C292 6 286 0 280 0L12 0Z">
+    	<fill>
+      		<SolidColor color="#464646"/>
+    	</fill>
+  	</Path>
+	<!-- Fill Shadow -->
+  	<Path x="2" y="2" data="M10 0 278 0C284 0 288 4 288 10L288 72C288 78 284 82 278 82L10 82C4 82 0 78 0 72L0 10C0 4 4 0 10 0Z">
+	    <fill>
+      		<LinearGradient x="144" y="0" scaleX="82.0005" rotation="90">
+        		<GradientEntry ratio="0" alpha="0.05"/>
+        		<GradientEntry ratio="1" alpha="0.25"/>
+      		</LinearGradient>
+    	</fill>
+  	</Path>
+  	<!-- Inner Shadow -->
+	<Path x="2" y="2" data="M2 10C2 6 6 2 10 2L278 2C282 2 286 6 286 10L286 72C286 76 282 80 278 80L10 80C6 80 2 76 2 72L2 10ZM10 0C4 0 0 4 0 10L0 72C0 78 4 82 10 82L278 82C284 82 288 78 288 72L288 10C288 4 284 0 278 0L10 0Z">
+	    <fill>
+      		<SolidColor alpha="0.2"/>
+    	</fill>
+  	</Path>
+  	<!-- Inner Inner Shadow -->
+	<Path x="4" y="4" data="M2 8C2 4 4 2 8 2L276 2C280 2 282 4 282 8L282 70C282 74 280 76 276 76L8 76C4 76 2 74 2 70L2 8ZM0 8 0 70C0 74 4 78 8 78L276 78C280 78 284 74 284 70L284 8C284 4 280 0 276 0L8 0C4 0 0 4 0 8Z">
+	    <fill>
+      		<SolidColor color="#646464" alpha="0.1"/>
+    	</fill>
+  	</Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/Button_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/Button_up.fxg
index f0623a1..3c917e1 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/Button_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/Button_up.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,11 +18,12 @@
 
 -->
 
-<Graphic version="2.0" viewHeight="86" viewWidth="292" scaleGridLeft="20" scaleGridRight="272" scaleGridTop="20" scaleGridBottom="66" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- Outer Border -->
-  <Path data="M12 2 280 2C286 2 290 6 290 12L290 74C290 80 286 84 280 84L12 84C6 84 2 80 2 74L2 12C2 6 6 2 12 2ZM12 0C6 0 0 6 0 12L0 74C0 80 6 86 12 86L280 86C286 86 292 80 292 74L292 12C292 6 286 0 280 0L12 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#646464"/>
-    </fill>
-  </Path>
+
+<Graphic version="2.0" viewHeight="86" viewWidth="292" xmlns="http://ns.adobe.com/fxg/2008" scaleGridLeft="20" scaleGridRight="272" scaleGridTop="20" scaleGridBottom="66">
+	<!-- Outer Border -->
+	<Path data="M12 2 280 2C286 2 290 6 290 12L290 74C290 80 286 84 280 84L12 84C6 84 2 80 2 74L2 12C2 6 6 2 12 2ZM12 0C6 0 0 6 0 12L0 74C0 80 6 86 12 86L280 86C286 86 292 80 292 74L292 12C292 6 286 0 280 0L12 0Z">
+    	<fill>
+    	  	<SolidColor color="#646464"/>
+    	</fill>
+  	</Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/CalloutContentBackground.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/CalloutContentBackground.fxg
index fc6618d..8442b96 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/CalloutContentBackground.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/CalloutContentBackground.fxg
@@ -18,26 +18,34 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="12" scaleGridRight="588" scaleGridTop="30" scaleGridBottom="388" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="399" width="600" height="1" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- Content Shading Top -->
-  <Rect x="0" y="0" width="600" height="20" topLeftRadiusX="10" topLeftRadiusY="10" topRightRadiusX="10" topRightRadiusY="10" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient rotation="90">
-        <GradientEntry ratio="0" color="#000000" alpha="0.6"/>
-        <GradientEntry ratio="0.5" color="#000000" alpha="0"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- Content Highlight -->
-  <Rect x="1" y="1" width="598" height="398" radiusX="10" radiusY="10" scaleX="2" scaleY="2">
-    <stroke>
-      <SolidColorStroke color="#FFFFFF" alpha="0.8" weight="2"/>
-    </stroke>
-  </Rect>
-</Graphic>
\ No newline at end of file
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+	scaleGridLeft="12" scaleGridRight="588" scaleGridTop="30" scaleGridBottom="388">
+
+	<!-- invisible fix for scaling -->
+	<Rect x="0" y="399" width="600" height="1">
+		<fill>
+			<SolidColor color="#ffffff" alpha="0"/>
+		</fill>
+	</Rect>
+    
+	<!-- Content Shading Top -->
+	<Rect x="0" y="0" width="600" height="20"
+			topLeftRadiusX="10" topLeftRadiusY="10"
+			topRightRadiusX="10" topRightRadiusY="10">
+		<fill>
+			<LinearGradient  rotation="90">
+				<GradientEntry ratio="0" color="#000000" alpha="0.6"/>
+				<GradientEntry ratio="0.5" color="#000000" alpha="0"/>
+			</LinearGradient>
+		</fill>
+	</Rect>
+		
+	<!-- Content Highlight -->
+	<Rect x="1" y="1" width="598" height="398"
+			radiusX="10" radiusY="10">
+		<stroke>
+			<SolidColorStroke color="#FFFFFF" alpha="0.8"
+								weight="2"/>
+		</stroke>
+	</Rect>
+</Graphic>
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/CheckBox_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/CheckBox_down.fxg
index df9bb55..7a2c8a6 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/CheckBox_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/CheckBox_down.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,49 +18,50 @@
 
 -->
 
+
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Rect x="4" y="62" alpha="0.08" width="56" height="2" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#FFFFFF"/>
-    </fill>
-  </Rect>
-  <Path x="4" y="4" data="M0 4C0 2 2 0 4 0L52 0C54 0 56 2 56 4L56 52C56 54 56 56 54 56L2 56C0 56 0 54 0 52L0 4Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="28" y="0" scaleX="56.0005" rotation="90">
-        <GradientEntry ratio="0" alpha="0.1"/>
-        <GradientEntry ratio="1" alpha="0.4"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path x="4" y="4" data="M2 6C2 4 4 2 6 2L50 2C52 2 54 4 54 6L54 50C54 52 54 54 52 54L4 54C2 54 2 52 2 50L2 6ZM0 4 0 52C0 54 0 56 2 56L54 56C56 56 56 54 56 52L56 4C56 2 54 0 52 0L4 0C2 0 0 2 0 4Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="28" y="0" scaleX="56" rotation="90">
-        <GradientEntry ratio="0" alpha="0.25"/>
-        <GradientEntry ratio="1" alpha="0.05"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path x="6" y="6" data="M2 6C2 4 4 2 6 2L46 2C48 2 50 4 50 6L50 46C50 48 50 50 48 50L4 50C2 50 2 48 2 46L2 6ZM0 4 0 48C0 50 0 52 2 52L50 52C52 52 52 50 52 48L52 4C52 2 50 0 48 0L4 0C2 0 0 2 0 4Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="26" y="0" scaleX="52" rotation="90">
-        <GradientEntry ratio="0" alpha="0.1"/>
-        <GradientEntry ratio="1" alpha="0"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path x="2" y="2" alpha="0.7" data="M2 6C2 4 4 2 6 2L54 2C56 2 58 4 58 6L58 54C58 56 58 58 56 58L4 58C2 58 2 56 2 54L2 6ZM0 4 0 56C0 58 2 60 4 60L56 60C58 60 60 58 60 56L60 4C60 2 58 0 56 0L4 0C2 0 0 4 0 4Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor/>
-    </fill>
-  </Path>
-  <Path alpha="0.06" data="M2 6C2 4 4 2 6 2L58 2C60 2 62 4 62 6L62 58C62 60 62 62 60 62L4 62C2 62 2 60 2 58L2 6ZM0 4 0 60C0 62 2 64 4 64L60 64C62 64 64 62 64 60L64 4C64 2 62 0 60 0L4 0C2 0 0 4 0 4Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#FFFFFF"/>
-    </fill>
-  </Path>
-  <Rect x="4" y="62" alpha="0.1" width="56" height="2" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#FFFFFF"/>
-    </fill>
-  </Rect>
+      <Rect x="4" y="62" alpha="0.08" width="56" height="2">
+        <fill>
+          <SolidColor color="#FFFFFF"/>
+        </fill>
+      </Rect>
+      <Path x="4" y="4" data="M0 4C0 2 2 0 4 0L52 0C54 0 56 2 56 4L56 52C56 54 56 56 54 56L2 56C0 56 0 54 0 52L0 4Z">
+        <fill>
+          <LinearGradient x="28" y="0" scaleX="56.0005" rotation="90">
+            <GradientEntry ratio="0" alpha="0.1"/>
+            <GradientEntry ratio="1" alpha="0.4"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      <Path x="4" y="4" data="M2 6C2 4 4 2 6 2L50 2C52 2 54 4 54 6L54 50C54 52 54 54 52 54L4 54C2 54 2 52 2 50L2 6ZM0 4 0 52C0 54 0 56 2 56L54 56C56 56 56 54 56 52L56 4C56 2 54 0 52 0L4 0C2 0 0 2 0 4Z">
+        <fill>
+          <LinearGradient x="28" y="0" scaleX="56" rotation="90">
+            <GradientEntry ratio="0" alpha="0.25"/>
+            <GradientEntry ratio="1" alpha="0.05"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      <Path x="6" y="6" data="M2 6C2 4 4 2 6 2L46 2C48 2 50 4 50 6L50 46C50 48 50 50 48 50L4 50C2 50 2 48 2 46L2 6ZM0 4 0 48C0 50 0 52 2 52L50 52C52 52 52 50 52 48L52 4C52 2 50 0 48 0L4 0C2 0 0 2 0 4Z">
+        <fill>
+          <LinearGradient x="26" y="0" scaleX="52" rotation="90">
+            <GradientEntry ratio="0" alpha="0.1"/>
+            <GradientEntry ratio="1" alpha="0"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      <Path x="2" y="2" alpha="0.7" data="M2 6C2 4 4 2 6 2L54 2C56 2 58 4 58 6L58 54C58 56 58 58 56 58L4 58C2 58 2 56 2 54L2 6ZM0 4 0 56C0 58 2 60 4 60L56 60C58 60 60 58 60 56L60 4C60 2 58 0 56 0L4 0C2 0 0 4 0 4Z">
+        <fill>
+          <SolidColor/>
+        </fill>
+      </Path>
+      <Path alpha="0.06" data="M2 6C2 4 4 2 6 2L58 2C60 2 62 4 62 6L62 58C62 60 62 62 60 62L4 62C2 62 2 60 2 58L2 6ZM0 4 0 60C0 62 2 64 4 64L60 64C62 64 64 62 64 60L64 4C64 2 62 0 60 0L4 0C2 0 0 4 0 4Z">
+        <fill>
+          <SolidColor color="#FFFFFF"/>
+        </fill>
+      </Path>
+      <Rect x="4" y="62" alpha="0.1" width="56" height="2">
+        <fill>
+          <SolidColor color="#FFFFFF"/>
+        </fill>
+      </Rect>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/CheckBox_downSymbol.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/CheckBox_downSymbol.fxg
index 4703aac..cfe76bf 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/CheckBox_downSymbol.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/CheckBox_downSymbol.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,23 +18,24 @@
 
 -->
 
+
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path x="4" y="10" data="M0 22 10 12 22 24 46 0 56 10 22 44 0 22Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="28" y="4" scaleX="44.0005" rotation="90">
-        <GradientEntry ratio="0" color="#999999"/>
-        <GradientEntry ratio="1" color="#B4B4B4"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path x="4" y="10" alpha="0.6" data="M0 22 10 12 22 24 46 0 56 10" scaleX="2" scaleY="2">
-    <stroke>
-      <SolidColorStroke weight="1" joints="bevel"/>
-    </stroke>
-  </Path>
-  <Path x="4" y="20" alpha="0.3" data="M0 12 22 34 56 0" scaleX="2" scaleY="2">
-    <stroke>
-      <SolidColorStroke weight="1" joints="bevel" color="#FFFFFF"/>
-    </stroke>
-  </Path>
+      <Path x="4" y="10" data="M0 22 10 12 22 24 46 0 56 10 22 44 0 22Z">
+        <fill>
+          <LinearGradient x="28" y="4" scaleX="44.0005" rotation="90">
+            <GradientEntry ratio="0" color="#999999"/>
+            <GradientEntry ratio="1" color="#B4B4B4"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      <Path x="4" y="10" alpha="0.6" data="M0 22 10 12 22 24 46 0 56 10">
+        <stroke>
+          <SolidColorStroke weight="1" joints="bevel"/>
+        </stroke>
+      </Path>
+      <Path x="4" y="20" alpha="0.3" data="M0 12 22 34 56 0">
+        <stroke>
+          <SolidColorStroke weight="1" joints="bevel" color="#FFFFFF"/>
+        </stroke>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/CheckBox_downSymbolSelected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/CheckBox_downSymbolSelected.fxg
index c25df80..d6843cc 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/CheckBox_downSymbolSelected.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/CheckBox_downSymbolSelected.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,23 +18,24 @@
 
 -->
 
+
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path x="4" y="10" data="M0 22 10 12 22 24 46 0 56 10 22 44 0 22Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="28" y="24" scaleX="48" rotation="90">
-        <GradientEntry ratio="0" color="#5A5A5A"/>
-        <GradientEntry ratio="1" color="#323232"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path x="4" y="10" alpha="0.25" data="M0 22 10 12 22 24 46 0 56 10" scaleX="2" scaleY="2">
-    <stroke>
-      <SolidColorStroke weight="1" joints="bevel" color="#FFFFFF"/>
-    </stroke>
-  </Path>
-  <Path x="4" y="20" alpha="0.7" data="M0 12 22 34 56 0" scaleX="2" scaleY="2">
-    <stroke>
-      <SolidColorStroke weight="1" joints="bevel"/>
-    </stroke>
-  </Path>
-</Graphic>
\ No newline at end of file
+      <Path x="4" y="10" data="M0 22 10 12 22 24 46 0 56 10 22 44 0 22Z">
+        <fill>
+          <LinearGradient x="28" y="24" scaleX="48" rotation="90">
+            <GradientEntry ratio="0" color="#5A5A5A"/>
+            <GradientEntry ratio="1" color="#323232"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      <Path x="4" y="10" alpha="0.25" data="M0 22 10 12 22 24 46 0 56 10">
+        <stroke>
+          <SolidColorStroke weight="1" joints="bevel" color="#FFFFFF"/>
+        </stroke>
+      </Path>
+      <Path x="4" y="20" alpha="0.7" data="M0 12 22 34 56 0">
+        <stroke>
+          <SolidColorStroke weight="1" joints="bevel"/>
+        </stroke>
+      </Path>
+  </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/CheckBox_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/CheckBox_up.fxg
index 418fceb..716997d 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/CheckBox_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/CheckBox_up.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,8 +18,9 @@
 
 -->
 
+
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path x="4" y="4" data="M0 4C0 2 2 0 4 0L52 0C54 0 56 2 56 4L56 52C56 54 56 56 54 56L2 56C0 56 0 54 0 52L0 4Z" scaleX="2" scaleY="2">
+  <Path x="4" y="4" data="M0 4C0 2 2 0 4 0L52 0C54 0 56 2 56 4L56 52C56 54 56 56 54 56L2 56C0 56 0 54 0 52L0 4Z">
     <fill>
       <LinearGradient x="28" y="8" scaleX="40.0004" rotation="90">
         <GradientEntry ratio="0" color="#FFFFFF" alpha="0.8"/>
@@ -27,7 +28,7 @@
       </LinearGradient>
     </fill>
   </Path>
-  <Path x="4" y="4" data="M2 6C2 4 4 2 6 2L50 2C52 2 54 4 54 6L54 50C54 52 54 54 52 54L4 54C2 54 2 52 2 50L2 6ZM0 4 0 52C0 54 0 56 2 56L54 56C56 56 56 54 56 52L56 4C56 2 54 0 52 0L4 0C2 0 0 2 0 4Z" scaleX="2" scaleY="2">
+  <Path x="4" y="4" data="M2 6C2 4 4 2 6 2L50 2C52 2 54 4 54 6L54 50C54 52 54 54 52 54L4 54C2 54 2 52 2 50L2 6ZM0 4 0 52C0 54 0 56 2 56L54 56C56 56 56 54 56 52L56 4C56 2 54 0 52 0L4 0C2 0 0 2 0 4Z">
     <fill>
       <LinearGradient x="28" y="0" scaleX="56.0005" rotation="90">
         <GradientEntry ratio="0" color="#FFFFFF" alpha="0.35"/>
@@ -35,22 +36,22 @@
       </LinearGradient>
     </fill>
   </Path>
-  <Path x="2" y="2" alpha="0.6" data="M2 6C2 4 4 2 6 2L54 2C56 2 58 4 58 6L58 54C58 56 58 58 56 58L4 58C2 58 2 56 2 54L2 6ZM0 4 0 56C0 58 2 60 4 60L56 60C58 60 60 58 60 56L60 4C60 2 58 0 56 0L4 0C2 0 0 4 0 4Z" scaleX="2" scaleY="2">
+  <Path x="2" y="2" alpha="0.6" data="M2 6C2 4 4 2 6 2L54 2C56 2 58 4 58 6L58 54C58 56 58 58 56 58L4 58C2 58 2 56 2 54L2 6ZM0 4 0 56C0 58 2 60 4 60L56 60C58 60 60 58 60 56L60 4C60 2 58 0 56 0L4 0C2 0 0 4 0 4Z">
     <fill>
       <SolidColor/>
     </fill>
   </Path>
-  <Path alpha="0.06" data="M2 6C2 4 4 2 6 2L58 2C60 2 62 4 62 6L62 58C62 60 62 62 60 62L4 62C2 62 2 60 2 58L2 6ZM0 4 0 60C0 62 2 64 4 64L60 64C62 64 64 62 64 60L64 4C64 2 62 0 60 0L4 0C2 0 0 4 0 4Z" scaleX="2" scaleY="2">
+  <Path alpha="0.06" data="M2 6C2 4 4 2 6 2L58 2C60 2 62 4 62 6L62 58C62 60 62 62 60 62L4 62C2 62 2 60 2 58L2 6ZM0 4 0 60C0 62 2 64 4 64L60 64C62 64 64 62 64 60L64 4C64 2 62 0 60 0L4 0C2 0 0 4 0 4Z">
     <fill>
       <SolidColor/>
     </fill>
   </Path>
-  <Rect x="6" y="4" alpha="0.15" width="52" height="2" scaleX="2" scaleY="2">
+  <Rect x="6" y="4" alpha="0.15" width="52" height="2">
     <fill>
       <SolidColor color="#FFFFFF"/>
     </fill>
   </Rect>
-  <Rect x="4" y="62" alpha="0.1" width="56" height="2" scaleX="2" scaleY="2">
+  <Rect x="4" y="62" alpha="0.1" width="56" height="2">
     <fill>
       <SolidColor/>
     </fill>
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/CheckBox_upSymbol.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/CheckBox_upSymbol.fxg
index 639ebda..29219e0 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/CheckBox_upSymbol.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/CheckBox_upSymbol.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,23 +18,24 @@
 
 -->
 
+
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path x="4" y="10" data="M0 22 10 12 22 24 46 0 56 10 22 44 0 22Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="28" y="24" scaleX="48" rotation="90">
-        <GradientEntry ratio="0" color="#C8C8C8"/>
-        <GradientEntry ratio="1" color="#E1E1E1"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path x="4" y="10" alpha="0.5" data="M0 22 10 12 22 24 46 0 56 10" scaleX="2" scaleY="2">
-    <stroke>
-      <SolidColorStroke weight="1" joints="bevel"/>
-    </stroke>
-  </Path>
-  <Path x="4" y="20" alpha="0.5" data="M0 12 22 34 56 0" scaleX="2" scaleY="2">
-    <stroke>
-      <SolidColorStroke weight="1" joints="bevel" color="#FFFFFF"/>
-    </stroke>
-  </Path>
+      <Path x="4" y="10" data="M0 22 10 12 22 24 46 0 56 10 22 44 0 22Z">
+        <fill>
+          <LinearGradient x="28" y="24" scaleX="48" rotation="90">
+            <GradientEntry ratio="0" color="#C8C8C8"/>
+            <GradientEntry ratio="1" color="#E1E1E1"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      <Path x="4" y="10" alpha="0.5" data="M0 22 10 12 22 24 46 0 56 10">
+        <stroke>
+          <SolidColorStroke weight="1" joints="bevel"/>
+        </stroke>
+      </Path>
+      <Path x="4" y="20" alpha="0.5" data="M0 12 22 34 56 0">
+        <stroke>
+          <SolidColorStroke weight="1" joints="bevel" color="#FFFFFF"/>
+        </stroke>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/CheckBox_upSymbolSelected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/CheckBox_upSymbolSelected.fxg
index 24d919a..51566c6 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/CheckBox_upSymbolSelected.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/CheckBox_upSymbolSelected.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,23 +18,24 @@
 
 -->
 
+
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path x="4" y="10" data="M0 22 10 12 22 24 46 0 56 10 22 44 0 22Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="28" y="12" scaleX="32" rotation="90">
-        <GradientEntry ratio="0" color="#5A5A5A"/>
-        <GradientEntry ratio="1" color="#323232"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path x="4" y="10" alpha="0.7" data="M0 22 10 12 22 24 46 0 56 10" scaleX="2" scaleY="2">
-    <stroke>
-      <SolidColorStroke weight="1" joints="bevel" color="#FFFFFF"/>
-    </stroke>
-  </Path>
-  <Path x="4" y="20" data="M0 12 22 34 56 0" scaleX="2" scaleY="2">
-    <stroke>
-      <SolidColorStroke weight="1" joints="bevel"/>
-    </stroke>
-  </Path>
+      <Path x="4" y="10" data="M0 22 10 12 22 24 46 0 56 10 22 44 0 22Z">
+        <fill>
+          <LinearGradient x="28" y="12" scaleX="32" rotation="90">
+            <GradientEntry ratio="0" color="#5A5A5A"/>
+            <GradientEntry ratio="1" color="#323232"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      <Path x="4" y="10" alpha="0.7" data="M0 22 10 12 22 24 46 0 56 10">
+        <stroke>
+          <SolidColorStroke weight="1" joints="bevel" color="#FFFFFF"/>
+        </stroke>
+      </Path>
+      <Path x="4" y="20" data="M0 12 22 34 56 0">
+        <stroke>
+          <SolidColorStroke weight="1" joints="bevel"/>
+        </stroke>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/HSliderThumb_normal.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/HSliderThumb_normal.fxg
index a17399c..17569ec 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/HSliderThumb_normal.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/HSliderThumb_normal.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,26 +18,27 @@
 
 -->
 
+
 <Graphic version="2.0" viewHeight="60" viewWidth="60" xmlns="http://ns.adobe.com/fxg/2008">
-  <Ellipse width="58" height="58" x="0" y="0" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="30" y="0" scaleX="58" rotation="90">
-        <GradientEntry ratio="0" alpha="0.15"/>
-        <GradientEntry ratio="1" alpha="0.25"/>
-      </LinearGradient>
-    </fill>
-  </Ellipse>
-  <Ellipse width="58" height="58" x="0" y="0" scaleX="2" scaleY="2">
-    <stroke>
-      <SolidColorStroke weight="2" caps="none"/>
-    </stroke>
-  </Ellipse>
-  <Ellipse width="58" height="58" x="0" y="0" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="26" y="10" scaleX="24" rotation="90">
-        <GradientEntry ratio="0" color="#FFFFFF" alpha="0.5"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/>
-      </LinearGradient>
-    </fill>
-  </Ellipse>
+      <Ellipse width="58" height="58" x="0" y="0">
+        <fill>
+          <LinearGradient x="30" y="0" scaleX="58" rotation="90">
+            <GradientEntry ratio="0" alpha="0.15"/>
+            <GradientEntry ratio="1" alpha="0.25"/>
+          </LinearGradient>
+        </fill>
+      </Ellipse>
+      <Ellipse width="58" height="58" x="0" y="0">
+        <stroke>
+          <SolidColorStroke weight="2" caps="none"/>
+        </stroke>
+      </Ellipse>
+      <Ellipse width="58" height="58" x="0" y="0">
+        <fill>
+          <LinearGradient x="26" y="10" scaleX="24" rotation="90">
+            <GradientEntry ratio="0" color="#FFFFFF" alpha="0.5"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/>
+          </LinearGradient>
+        </fill>
+      </Ellipse>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/HSliderThumb_pressed.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/HSliderThumb_pressed.fxg
index d564837..e4ea710 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/HSliderThumb_pressed.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/HSliderThumb_pressed.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,38 +18,39 @@
 
 -->
 
-<Graphic version="2.0" viewHeight="60" viewWidth="60" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- outer ellipse -->
-  <Ellipse x="0.5" y="0.5" width="58" height="58" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="28.9995" y="0" scaleX="58.0005" rotation="90">
-        <GradientEntry ratio="0" alpha="0.05"/>
-        <GradientEntry ratio="1" alpha="0.15"/>
-      </LinearGradient>
-    </fill>
-  </Ellipse>
-  <!-- outer border -->
-  <Ellipse x="1.5" y="1.5" width="56" height="56" scaleX="2" scaleY="2">
-    <stroke>
-      <SolidColorStroke weight="2" caps="none" alpha="0.7"/>
-    </stroke>
-  </Ellipse>
-  <!-- inner ellipse -->
-  <Ellipse x="1.5" y="1.5" width="56" height="56" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="28.9995" y="4" scaleX="53.9995" rotation="90">
-        <GradientEntry ratio="0" alpha="0.25"/>
-        <GradientEntry ratio="1" alpha="0.6"/>
-      </LinearGradient>
-    </fill>
-  </Ellipse>
-  <!-- inner border -->
-  <Path x="1" y="1" data="M2.19238 28.75C2.19238 13.27 13.1533 2.21191 28.5 2.21191 43.8457 2.21191 54.8066 13.27 54.8066 28.75 54.8066 44.2324 43.8457 55.29 28.5 55.29 13.1533 55.29 2.19238 44.2324 2.19238 28.75ZM0 28.75C0 44.2324 13.1533 57.5 28.5 57.5 43.8457 57.5 57 44.2324 57 28.75 57 13.27 43.8457 0 28.5 0 13.1533 0 0 13.27 0 28.75Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="28.4995" y="4.10693" scaleX="53.3924" rotation="90">
-        <GradientEntry ratio="0" alpha="0.25"/>
-        <GradientEntry ratio="1" alpha="0.1"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+
+<Graphic version="2.0" viewHeight="60" viewWidth="60" xmlns="http://ns.adobe.com/fxg/2008" >
+	<!-- outer ellipse -->
+      <Ellipse x="0.5" y="0.5" width="58" height="58">
+        <fill>
+          <LinearGradient x="28.9995" y="0" scaleX="58.0005" rotation="90">
+            <GradientEntry ratio="0" alpha="0.05"/>
+            <GradientEntry ratio="1" alpha="0.15"/>
+          </LinearGradient>
+        </fill>
+      </Ellipse>
+	<!-- outer border -->
+      <Ellipse x="1.5" y="1.5" width="56" height="56">
+        <stroke>
+          <SolidColorStroke weight="2" caps="none" alpha="0.7"/>
+        </stroke>
+      </Ellipse>
+	<!-- inner ellipse -->
+      <Ellipse x="1.5" y="1.5" width="56" height="56">
+        <fill>
+          <LinearGradient x="28.9995" y="4" scaleX="53.9995" rotation="90">
+            <GradientEntry ratio="0" alpha="0.25"/>
+            <GradientEntry ratio="1" alpha="0.6"/>
+          </LinearGradient>
+        </fill>
+      </Ellipse>
+	<!-- inner border -->
+      <Path x="1" y="1" data="M2.19238 28.75C2.19238 13.27 13.1533 2.21191 28.5 2.21191 43.8457 2.21191 54.8066 13.27 54.8066 28.75 54.8066 44.2324 43.8457 55.29 28.5 55.29 13.1533 55.29 2.19238 44.2324 2.19238 28.75ZM0 28.75C0 44.2324 13.1533 57.5 28.5 57.5 43.8457 57.5 57 44.2324 57 28.75 57 13.27 43.8457 0 28.5 0 13.1533 0 0 13.27 0 28.75Z">
+        <fill>
+          <LinearGradient x="28.4995" y="4.10693" scaleX="53.3924" rotation="90">
+            <GradientEntry ratio="0" alpha="0.25"/>
+            <GradientEntry ratio="1" alpha="0.1"/>
+          </LinearGradient>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/HSliderTrack.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/HSliderTrack.fxg
index 1f6a0b0..a0f7948 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/HSliderTrack.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/HSliderTrack.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,26 +18,28 @@
 
 -->
 
-<Graphic version="2.0" viewHeight="18" viewWidth="640" scaleGridLeft="30" scaleGridRight="610" scaleGridTop="1" scaleGridBottom="17" xmlns="http://ns.adobe.com/fxg/2008">
-  <Rect x="20" y="0.5" width="600" height="16" radiusX="7.24087" radiusY="7.24087" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="300" y="0" scaleX="16.0005" rotation="90">
-        <GradientEntry ratio="0" alpha="0.5"/>
-        <GradientEntry ratio="1" alpha="0.2"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <Path x="20" y="0.5" data="M0 8C2 4 4 2 8 2L592 2C596 2 598 4 600 8 600 4 596 0 592 0L8 0C4 0 0 4 0 8Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="300" y="0" scaleX="10" rotation="90">
-        <GradientEntry ratio="0" alpha="0.4"/>
-        <GradientEntry ratio="1" alpha="0.05"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Rect width="640" height="18" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor alpha="0"/>
-    </fill>
-  </Rect>
+
+<Graphic version="2.0" viewHeight="18" viewWidth="640" xmlns="http://ns.adobe.com/fxg/2008"
+         scaleGridLeft="30" scaleGridRight="610" scaleGridTop="1" scaleGridBottom="17">
+      <Rect x="20" y="0.5" width="600" height="16" radiusX="7.24087" radiusY="7.24087">
+        <fill>
+          <LinearGradient x="300" y="0" scaleX="16.0005" rotation="90">
+            <GradientEntry ratio="0" alpha="0.5"/>
+            <GradientEntry ratio="1" alpha="0.2"/>
+          </LinearGradient>
+        </fill>
+      </Rect>
+      <Path x="20" y="0.5" data="M0 8C2 4 4 2 8 2L592 2C596 2 598 4 600 8 600 4 596 0 592 0L8 0C4 0 0 4 0 8Z">
+        <fill>
+          <LinearGradient x="300" y="0" scaleX="10" rotation="90">
+            <GradientEntry ratio="0" alpha="0.4"/>
+            <GradientEntry ratio="1" alpha="0.05"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      <Rect width="640" height="18">
+        <fill>
+          <SolidColor alpha="0"/>
+        </fill>
+      </Rect>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ImageInvalid.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ImageInvalid.fxg
index 000b581..98d1639 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ImageInvalid.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ImageInvalid.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,25 +18,29 @@
 
 -->
 
+
 <Graphic version="2.0" viewHeight="68" viewWidth="68" xmlns="http://ns.adobe.com/fxg/2008">
-  <Rect x="0.5" y="0.5" width="67" height="67" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#FFFFFF"/>
-    </fill>
-  </Rect>
-  <Path winding="nonZero" data="M67 1 67 67 1 67 1 1 67 1M68 0 0 0 0 68 68 68 68 0 68 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#FFFFFF"/>
-    </fill>
-  </Path>
-  <Path winding="nonZero" data="M0 0 0 68 68 68 68 0 0 0ZM64 64 4 64 4 4 64 4 64 64Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#969696"/>
-    </fill>
-  </Path>
-  <Path x="8" y="8" winding="nonZero" data="M0 0 0 52 52 52 52 0 0 0ZM26.1396 47.9668C23.5303 47.9668 21.5713 46.2676 21.5713 43.3945 21.5713 40.6543 23.5303 38.8906 26.1396 38.8906 28.8818 38.8906 30.71 40.7832 30.71 43.3945 30.71 46.1367 29.0127 47.9668 26.1396 47.9668ZM28.5557 29.6855&#xD;&#xA;C28.5557 30.8594 29.0127 32.0713 29.7295 33.3115 29.8623 33.5713 29.7295 34 29.4053 34L23.6592 34C23.333 34 23.2021 33.833 22.876 33.5088 21.7002 32.2002 21.1787 30.291 21.1787 28.9844 21.1787 23.7617 29.7295 20.5225 29.7295 15.2998 29.7295 12.752&#xD;&#xA; 27.6396 10.5117 23.6592 10.5117 20.3955 10.5117 18.3911 11.1543 16.1079 12.1338 15.8462 12.2646 16 12.1235 16 11.8618L16 6.70459C16 6.44287 15.6509 6.18213 15.9106 6.05127 17.5454 5.26807 20.6357 4.02881 25.4639 4.02881 33.1045 4.02881 37.9141&#xD;&#xA; 8.40186 37.9141 14.6694 37.9141 21.8491 28.5557 25.9644 28.5557 29.6855Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#969696"/>
-    </fill>
-  </Path>
+        <Rect x="0.5" y="0.5" width="67" height="67">
+          <fill>
+            <SolidColor color="#FFFFFF"/>
+          </fill>
+        </Rect>
+        <Path winding="nonZero" data="M67 1 67 67 1 67 1 1 67 1M68 0 0 0 0 68 68 68 68 0 68 0Z">
+          <fill>
+            <SolidColor color="#FFFFFF"/>
+          </fill>
+        </Path>
+      <Path winding="nonZero" data="M0 0 0 68 68 68 68 0 0 0ZM64 64 4 64 4 4 64 4 64 64Z">
+        <fill>
+          <SolidColor color="#969696"/>
+        </fill>
+      </Path>
+      <Path x="8" y="8" winding="nonZero" data="M0 0 0 52 52 52 52 0 0 0ZM26.1396 47.9668C23.5303 47.9668 21.5713 46.2676 21.5713 43.3945 21.5713 40.6543 23.5303 38.8906 26.1396 38.8906 28.8818 38.8906 30.71 40.7832 30.71 43.3945 30.71 46.1367 29.0127 47.9668 26.1396 47.9668ZM28.5557 29.6855
+C28.5557 30.8594 29.0127 32.0713 29.7295 33.3115 29.8623 33.5713 29.7295 34 29.4053 34L23.6592 34C23.333 34 23.2021 33.833 22.876 33.5088 21.7002 32.2002 21.1787 30.291 21.1787 28.9844 21.1787 23.7617 29.7295 20.5225 29.7295 15.2998 29.7295 12.752
+ 27.6396 10.5117 23.6592 10.5117 20.3955 10.5117 18.3911 11.1543 16.1079 12.1338 15.8462 12.2646 16 12.1235 16 11.8618L16 6.70459C16 6.44287 15.6509 6.18213 15.9106 6.05127 17.5454 5.26807 20.6357 4.02881 25.4639 4.02881 33.1045 4.02881 37.9141
+ 8.40186 37.9141 14.6694 37.9141 21.8491 28.5557 25.9644 28.5557 29.6855Z">
+        <fill>
+          <SolidColor color="#969696"/>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/RadioButton_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/RadioButton_down.fxg
index 803d417..4d7cdea 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/RadioButton_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/RadioButton_down.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,32 +17,32 @@
   limitations under the License.
 
 -->
-
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path data="M2 32C2 16 16 2 32 2 48 2 62 16 62 32 62 48 48 62 32 62 16 62 2 48 2 32ZM0 32C0 50 14 64 32 64 50 64 64 50 64 32 64 14 50 0 32 0 14 0 0 14 0 32Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="32" y="0" scaleX="64.0005" rotation="90">
-        <GradientEntry ratio="0" color="#FFFFFF" alpha="0"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0.14902"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path x="4" y="4" data="M0 28C0 12 12 0 28 0 44 0 56 12 56 28 56 44 44 56 28 56 12 56 0 44 0 28Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="28" y="0" scaleX="56.0005" rotation="90">
-        <GradientEntry ratio="0" alpha="0.109804"/>
-        <GradientEntry ratio="1" alpha="0.4"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path x="4" y="4" alpha="0.14902" data="M0 28C0 12 12 0 28 0 44 0 56 12 56 28 56 44 44 56 28 56 12 56 0 44 0 28Z" scaleX="2" scaleY="2">
-    <stroke>
-      <SolidColorStroke weight="1" caps="none"/>
-    </stroke>
-  </Path>
-  <Path x="2" y="2" alpha="0.65098" data="M2 30C2 14 14 2 30 2 46 2 58 14 58 30 58 46 46 58 30 58 14 58 2 46 2 30ZM0 30C0 46 14 60 30 60 46 60 60 46 60 30 60 14 46 0 30 0 14 0 0 14 0 30Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor/>
-    </fill>
-  </Path>
+  
+      <Path data="M2 32C2 16 16 2 32 2 48 2 62 16 62 32 62 48 48 62 32 62 16 62 2 48 2 32ZM0 32C0 50 14 64 32 64 50 64 64 50 64 32 64 14 50 0 32 0 14 0 0 14 0 32Z">
+        <fill>
+          <LinearGradient x="32" y="0" scaleX="64.0005" rotation="90">
+            <GradientEntry ratio="0" color="#FFFFFF" alpha="0"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0.14902"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      <Path x="4" y="4" data="M0 28C0 12 12 0 28 0 44 0 56 12 56 28 56 44 44 56 28 56 12 56 0 44 0 28Z">
+        <fill>
+          <LinearGradient x="28" y="0" scaleX="56.0005" rotation="90">
+            <GradientEntry ratio="0" alpha="0.109804"/>
+            <GradientEntry ratio="1" alpha="0.4"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      <Path x="4" y="4" alpha="0.14902" data="M0 28C0 12 12 0 28 0 44 0 56 12 56 28 56 44 44 56 28 56 12 56 0 44 0 28Z">
+        <stroke>
+          <SolidColorStroke weight="1" caps="none"/>
+        </stroke>
+      </Path>
+      <Path x="2" y="2" alpha="0.65098" data="M2 30C2 14 14 2 30 2 46 2 58 14 58 30 58 46 46 58 30 58 14 58 2 46 2 30ZM0 30C0 46 14 60 30 60 46 60 60 46 60 30 60 14 46 0 30 0 14 0 0 14 0 30Z">
+        <fill>
+          <SolidColor/>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/RadioButton_downSymbol.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/RadioButton_downSymbol.fxg
index 0fe91f5..6652cf1 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/RadioButton_downSymbol.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/RadioButton_downSymbol.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,19 +17,18 @@
   limitations under the License.
 
 -->
-
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path x="16" y="16" data="M0 16C0 8 8 0 16 0 24 0 32 8 32 16 32 24 24 32 16 32 8 32 0 24 0 16Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#646464"/>
-    </fill>
-  </Path>
-  <Path x="18" y="18" data="M0 14C0 6 6 0 14 0 22 0 28 6 28 14 28 22 22 28 14 28 6 28 0 22 0 14Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="14" y="0" scaleX="28" rotation="90">
-        <GradientEntry ratio="0" color="#787878"/>
-        <GradientEntry ratio="1" color="#969696"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+    <Path x="16" y="16" data="M0 16C0 8 8 0 16 0 24 0 32 8 32 16 32 24 24 32 16 32 8 32 0 24 0 16Z">
+    	<fill>
+		    <SolidColor color="#646464"/>
+    	</fill>
+	</Path>
+    <Path x="18" y="18" data="M0 14C0 6 6 0 14 0 22 0 28 6 28 14 28 22 22 28 14 28 6 28 0 22 0 14Z">
+    	<fill>
+    		<LinearGradient x="14" y="0" scaleX="28" rotation="90">
+    			<GradientEntry ratio="0" color="#787878"/>
+    			<GradientEntry ratio="1" color="#969696"/>
+    		</LinearGradient>
+    	</fill>
+    </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/RadioButton_downSymbolSelected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/RadioButton_downSymbolSelected.fxg
index 2cf1f2b..e425a8b 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/RadioButton_downSymbolSelected.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/RadioButton_downSymbolSelected.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,19 +17,18 @@
   limitations under the License.
 
 -->
-
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path x="16" y="16" data="M0 16C0 8 8 0 16 0 24 0 32 8 32 16 32 24 24 32 16 32 8 32 0 24 0 16Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#323232"/>
-    </fill>
-  </Path>
-  <Path x="18" y="18" data="M0 14C0 6 6 0 14 0 22 0 28 6 28 14 28 22 22 28 14 28 6 28 0 22 0 14Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="14" y="0" scaleX="30" rotation="90">
-        <GradientEntry ratio="0" color="#464646"/>
-        <GradientEntry ratio="1" color="#1E1E1E"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+    <Path x="16" y="16" data="M0 16C0 8 8 0 16 0 24 0 32 8 32 16 32 24 24 32 16 32 8 32 0 24 0 16Z">
+        <fill>
+        	<SolidColor color="#323232"/>
+        </fill>
+    </Path>
+    <Path x="18" y="18" data="M0 14C0 6 6 0 14 0 22 0 28 6 28 14 28 22 22 28 14 28 6 28 0 22 0 14Z">
+        <fill>
+            <LinearGradient x="14" y="0" scaleX="30" rotation="90">
+                <GradientEntry ratio="0" color="#464646"/>
+                <GradientEntry ratio="1" color="#1E1E1E"/>
+            </LinearGradient>
+        </fill>
+    </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/RadioButton_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/RadioButton_up.fxg
index 2afc6a5..f6ea86f 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/RadioButton_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/RadioButton_up.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,27 +17,27 @@
   limitations under the License.
 
 -->
-
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path data="M2 32C2 16 16 2 32 2 48 2 62 16 62 32 62 48 48 62 32 62 16 62 2 48 2 32ZM0 32C0 50 14 64 32 64 50 64 64 50 64 32 64 14 50 0 32 0 14 0 0 14 0 32Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="32" y="0" scaleX="64.0005" rotation="90">
-        <GradientEntry ratio="0" alpha="0"/>
-        <GradientEntry ratio="1" alpha="0.2"/>
-      </LinearGradient>
-    </fill>
-  </Path>
-  <Path x="2" y="2" alpha="0.6" data="M2 30C2 14 14 2 30 2 46 2 58 14 58 30 58 46 46 58 30 58 14 58 2 46 2 30ZM0 30C0 46 14 60 30 60 46 60 60 46 60 30 60 14 46 0 30 0 14 0 0 14 0 30Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor/>
-    </fill>
-  </Path>
-  <Path x="4" y="4" data="M0 28C0 12 12 0 28 0 44 0 56 12 56 28 56 44 44 56 28 56 12 56 0 44 0 28Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="28" y="8" scaleX="26.0002" rotation="90">
-        <GradientEntry ratio="0" color="#FFFFFF" alpha="0.8"/>
-        <GradientEntry ratio="1" color="#FFFFFF" alpha="0"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+  
+      <Path data="M2 32C2 16 16 2 32 2 48 2 62 16 62 32 62 48 48 62 32 62 16 62 2 48 2 32ZM0 32C0 50 14 64 32 64 50 64 64 50 64 32 64 14 50 0 32 0 14 0 0 14 0 32Z">
+        <fill>
+          <LinearGradient x="32" y="0" scaleX="64.0005" rotation="90">
+            <GradientEntry ratio="0" alpha="0"/>
+            <GradientEntry ratio="1" alpha="0.2"/>
+          </LinearGradient>
+        </fill>
+      </Path>
+      <Path x="2" y="2" alpha="0.6" data="M2 30C2 14 14 2 30 2 46 2 58 14 58 30 58 46 46 58 30 58 14 58 2 46 2 30ZM0 30C0 46 14 60 30 60 46 60 60 46 60 30 60 14 46 0 30 0 14 0 0 14 0 30Z">
+        <fill>
+          <SolidColor/>
+        </fill>
+      </Path>
+      <Path x="4" y="4" data="M0 28C0 12 12 0 28 0 44 0 56 12 56 28 56 44 44 56 28 56 12 56 0 44 0 28Z">
+        <fill>
+          <LinearGradient x="28" y="8" scaleX="26.0002" rotation="90">
+            <GradientEntry ratio="0" color="#FFFFFF" alpha="0.8"/>
+            <GradientEntry ratio="1" color="#FFFFFF" alpha="0"/>
+          </LinearGradient>
+        </fill>
+      </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/RadioButton_upSymbol.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/RadioButton_upSymbol.fxg
index 65ea418..a9e5b14 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/RadioButton_upSymbol.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/RadioButton_upSymbol.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,19 +17,18 @@
   limitations under the License.
 
 -->
-
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path x="16" y="16" data="M0 16C0 8 8 0 16 0 24 0 32 8 32 16 32 24 24 32 16 32 8 32 0 24 0 16Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#969696"/>
-    </fill>
-  </Path>
-  <Path x="18" y="18" data="M0 14C0 6 6 0 14 0 22 0 28 6 28 14 28 22 22 28 14 28 6 28 0 22 0 14Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="14" y="0" scaleX="20" rotation="90">
-        <GradientEntry ratio="0" color="#999999"/>
-        <GradientEntry ratio="1" color="#B4B4B4"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+    <Path x="16" y="16" data="M0 16C0 8 8 0 16 0 24 0 32 8 32 16 32 24 24 32 16 32 8 32 0 24 0 16Z">
+        <fill>
+        	<SolidColor color="#969696"/>
+        </fill>
+    </Path>
+    <Path x="18" y="18" data="M0 14C0 6 6 0 14 0 22 0 28 6 28 14 28 22 22 28 14 28 6 28 0 22 0 14Z">
+        <fill>
+            <LinearGradient x="14" y="0" scaleX="20" rotation="90">
+                <GradientEntry ratio="0" color="#999999"/>
+                <GradientEntry ratio="1" color="#B4B4B4"/>
+            </LinearGradient>
+        </fill>
+    </Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/RadioButton_upSymbolSelected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/RadioButton_upSymbolSelected.fxg
index 12fc6ca..449affb 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/RadioButton_upSymbolSelected.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/RadioButton_upSymbolSelected.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,19 +17,18 @@
   limitations under the License.
 
 -->
-
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path x="16" y="16" data="M0 16C0 8 8 0 16 0 24 0 32 8 32 16 32 24 24 32 16 32 8 32 0 24 0 16Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#323232"/>
-    </fill>
-  </Path>
-  <Path x="18" y="18" data="M0 14C0 6 6 0 14 0 22 0 28 6 28 14 28 22 22 28 14 28 6 28 0 22 0 14Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="14" y="0" scaleX="30" rotation="90">
-        <GradientEntry ratio="0" color="#5A5A5A"/>
-        <GradientEntry ratio="1" color="#323232"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+	<Path x="16" y="16" data="M0 16C0 8 8 0 16 0 24 0 32 8 32 16 32 24 24 32 16 32 8 32 0 24 0 16Z">
+    	<fill>
+    		<SolidColor color="#323232"/>
+        </fill>
+	</Path>
+    <Path x="18" y="18" data="M0 14C0 6 6 0 14 0 22 0 28 6 28 14 28 22 22 28 14 28 6 28 0 22 0 14Z">
+    	<fill>
+        	<LinearGradient x="14" y="0" scaleX="30" rotation="90">
+            	<GradientEntry ratio="0" color="#5A5A5A"/>
+            	<GradientEntry ratio="1" color="#323232"/>
+          	</LinearGradient>
+		</fill>
+	</Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/SpinnerListContainerBackground.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/SpinnerListContainerBackground.fxg
index 9936b75..77865dc 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/SpinnerListContainerBackground.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/SpinnerListContainerBackground.fxg
@@ -17,16 +17,17 @@
   limitations under the License.
 
 -->
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008" viewHeight= "100" viewWidth= "100"
+	scaleGridLeft="12" scaleGridTop="12" scaleGridRight="88" scaleGridBottom="88">
 
-<Graphic version="2.0" viewHeight="100" viewWidth="100" scaleGridLeft="12" scaleGridTop="12" scaleGridRight="88" scaleGridBottom="88" xmlns="http://ns.adobe.com/fxg/2008">
-  <Rect width="100" height="100" radiusX="10" radiusY="10" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#4D4D4D"/>
-    </fill>
-  </Rect>
-  <Rect x="2" y="2" width="96" height="96" radiusX="10" radiusY="10" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#F2F2F2"/>
-    </fill>
-  </Rect>
+	<Rect width="100" height="100" radiusX="10" radiusY="10">
+		<fill>
+			<SolidColor color="#4D4D4D"/>
+		</fill>
+	</Rect>
+	<Rect x="2" y="2" width="96" height="96" radiusX="10" radiusY="10">
+		<fill>	
+			<SolidColor color="#F2F2F2"/>
+		</fill>
+	</Rect>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/SpinnerListContainerSelectionIndicator.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/SpinnerListContainerSelectionIndicator.fxg
index f0e8415..421d325 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/SpinnerListContainerSelectionIndicator.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/SpinnerListContainerSelectionIndicator.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,51 +17,51 @@
   limitations under the License.
 
 -->
-
-<Graphic version="2.0" viewHeight="96" viewWidth="100" scaleGridLeft="5" scaleGridTop="12" scaleGridRight="95" scaleGridBottom="83" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- Transparent rect used to center the bar -->
-  <Rect x="0" y="0" width="100" height="8" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- Border -->
-  <Path y="8" winding="nonZero" data="M100 80 0 80 0 0 100 0 100 80ZM2 78 98 78 98 2 2 2 2 78Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#666666"/>
-    </fill>
-  </Path>
-  <!-- Two tone gradient background -->
-  <Rect x="2" y="10" width="96" height="76" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient rotation="90">
-        <GradientEntry ratio="0.0" color="#E6E6E6" alpha="0.2"/>
-        <GradientEntry ratio="0.2" color="#E6E6E6" alpha="0.4"/>
-        <GradientEntry ratio="0.5" color="#E6E6E6" alpha="0.3"/>
-        <GradientEntry ratio="0.5" color="#000000" alpha="0.12"/>
-        <GradientEntry ratio="1.0" color="#000000" alpha="0.2"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- Top highlight -->
-  <Rect x="4" y="10" width="92" height="2" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#FFFFFF"/>
-    </fill>
-  </Rect>
-  <!-- Bottom highlight -->
-  <Rect x="4" y="84" width="92" height="2" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#FFFFFF"/>
-    </fill>
-  </Rect>
-  <!-- Shadow -->
-  <Rect x="4" y="88" width="92" height="8" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient rotation="90">
-        <GradientEntry ratio="0" color="#000000" alpha="0.15"/>
-        <GradientEntry ratio="1" color="#000000" alpha="0"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-</Graphic>
\ No newline at end of file
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008" viewHeight="96" viewWidth="100"
+	scaleGridLeft="5" scaleGridTop="12" scaleGridRight="95" scaleGridBottom="83">
+	<!-- Transparent rect used to center the bar -->
+	<Rect x="0" y="0" width="100" height="8">
+		<fill>
+			<SolidColor color="#000000" alpha="0"/>
+		</fill>
+	</Rect>
+	<!-- Border --> 
+	<Path y="8" winding="nonZero" data="M100 80 0 80 0 0 100 0 100 80ZM2 78 98 78 98 2 2 2 2 78Z">
+        <fill>
+           	<SolidColor color="#666666"/>
+    	</fill>
+   	</Path>
+   	<!-- Two tone gradient background -->
+   	<Rect x="2" y="10" width="96" height="76">
+       	<fill>
+   			<LinearGradient rotation="90">
+               	<GradientEntry ratio="0.0" color="#E6E6E6" alpha="0.2"/>
+   				<GradientEntry ratio="0.2" color="#E6E6E6" alpha="0.4"/>
+   				<GradientEntry ratio="0.5" color="#E6E6E6" alpha="0.3"/>
+   				<GradientEntry ratio="0.5" color="#000000" alpha="0.12"/>
+   				<GradientEntry ratio="1.0" color="#000000" alpha="0.2"/>
+   			</LinearGradient>
+   		</fill>
+   	</Rect>
+   	<!-- Top highlight -->
+   	<Rect x="4" y="10" width="92" height="2">
+       	<fill>
+           	<SolidColor color="#FFFFFF"/>
+        </fill>
+   	</Rect>
+   	<!-- Bottom highlight -->
+   	<Rect x="4" y="84" width="92" height="2">
+       	<fill>
+           	<SolidColor color="#FFFFFF"/>
+		</fill>
+   	</Rect>
+   	<!-- Shadow -->
+    <Rect x="4" y="88" width="92" height="8">
+  		<fill>
+   			<LinearGradient rotation="90">
+   				<GradientEntry ratio="0" color="#000000" alpha="0.15"/>
+   				<GradientEntry ratio="1" color="#000000" alpha="0"/>
+   			</LinearGradient>
+        </fill>
+   	</Rect>
+</Graphic>
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/SpinnerListContainerShadow.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/SpinnerListContainerShadow.fxg
index 912e5c4..7e0835e 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/SpinnerListContainerShadow.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/SpinnerListContainerShadow.fxg
@@ -17,16 +17,16 @@
   limitations under the License.
 
 -->
-
-<Graphic version="2.0" viewHeight="100" viewWidth="100" scaleGridLeft="10" scaleGridTop="10" scaleGridRight="90" scaleGridBottom="90" xmlns="http://ns.adobe.com/fxg/2008">
-  <Rect width="100" height="100" radiusX="10" radiusY="10" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient rotation="270">
-        <GradientEntry ratio="0.0" color="#231F20" alpha="0.7"/>
-        <GradientEntry ratio="0.35" color="#FFFFFF" alpha="0"/>
-        <GradientEntry ratio="0.75" color="#EAE9E9" alpha="0"/>
-        <GradientEntry ratio="1.0" color="#231F20" alpha="0.65"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008" viewHeight= "100" viewWidth= "100"
+	scaleGridLeft="10" scaleGridTop="10" scaleGridRight="90" scaleGridBottom="90">
+	<Rect width="100" height="100" radiusX="10" radiusY="10">
+		<fill>
+			<LinearGradient rotation="270">
+				<GradientEntry ratio="0.0" color="#231F20" alpha="0.7"/>
+				<GradientEntry ratio="0.35" color="#FFFFFF" alpha="0"/>
+				<GradientEntry ratio="0.75" color="#EAE9E9" alpha="0"/>
+				<GradientEntry ratio="1.0" color="#231F20" alpha="0.65"/>
+			</LinearGradient>
+		</fill>
+	</Rect>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TabbedViewNavigatorButtonBarFirstButton_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TabbedViewNavigatorButtonBarFirstButton_down.fxg
index da737e6..62e833f 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TabbedViewNavigatorButtonBarFirstButton_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TabbedViewNavigatorButtonBarFirstButton_down.fxg
@@ -18,38 +18,46 @@
 
 -->
 
-<Graphic version="2.0" scaleGridTop="4" scaleGridBottom="72" scaleGridLeft="3" scaleGridRight="117" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- highlight fill -->
-  <Rect x="0" y="2" width="120" height="72" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="0" scaleX="72" rotation="90">
-        <GradientEntry color="#000000" ratio="0" alpha=".3"/>
-        <GradientEntry color="#000000" ratio="1" alpha=".15"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- border top -->
-  <Rect x="0" y="0" width="120" height="2" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0.75"/>
-    </fill>
-  </Rect>
-  <!-- border bottom -->
-  <Rect x="0" y="74" width="120" height="2" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0.75"/>
-    </fill>
-  </Rect>
-  <!-- highlight stroke -->
-  <Rect x="0.5" y="2.5" width="119" height="71" scaleX="2" scaleY="2">
-    <stroke>
-      <SolidColorStroke color="#000000" weight="1" alpha=".1"/>
-    </stroke>
-  </Rect>
-  <!-- scaling fix -->
-  <Rect x="0" y="0" width="120" height="76" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0"/>
-    </fill>
-  </Rect>
+
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridTop="4" scaleGridBottom="72" scaleGridLeft="3" scaleGridRight="117">
+    
+    <!-- highlight fill -->
+    <Rect x="0" y="2" width="120" height="72">
+        <fill>
+            <LinearGradient x="0" scaleX="72" rotation="90">
+                <GradientEntry color="#000000" ratio="0" alpha=".3"/>
+                <GradientEntry color="#000000" ratio="1" alpha=".15"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+    
+    <!-- border top -->
+    <Rect x="0" y="0" width="120" height="2">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.75"/>
+        </fill>
+    </Rect>
+    
+    <!-- border bottom -->
+    <Rect x="0" y="74" width="120" height="2">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.75"/>
+        </fill>
+    </Rect>
+    
+    <!-- highlight stroke -->
+    <Rect x="0.5" y="2.5" width="119" height="71">
+    	<stroke>
+    		<SolidColorStroke color="#000000" weight="1" alpha=".1"/>
+    	</stroke>
+    </Rect>
+    
+    <!-- scaling fix -->
+    <Rect x="0" y="0" width="120" height="76">
+        <fill>
+    		<SolidColor color="#000000" alpha="0"/>
+        </fill>
+    </Rect>
+    
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TabbedViewNavigatorButtonBarFirstButton_selected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TabbedViewNavigatorButtonBarFirstButton_selected.fxg
index 8cd9fff..dd2249c 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TabbedViewNavigatorButtonBarFirstButton_selected.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TabbedViewNavigatorButtonBarFirstButton_selected.fxg
@@ -18,38 +18,45 @@
 
 -->
 
-<Graphic version="2.0" scaleGridTop="4" scaleGridBottom="72" scaleGridLeft="3" scaleGridRight="117" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- highlight fill -->
-  <Rect x="0" y="2" width="120" height="72" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="0" scaleX="72" rotation="90">
-        <GradientEntry color="#000000" ratio="0" alpha=".05"/>
-        <GradientEntry color="#000000" ratio="1" alpha=".1"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- border top -->
-  <Rect x="0" y="0" width="120" height="2" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0.75"/>
-    </fill>
-  </Rect>
-  <!-- border bottom -->
-  <Rect x="0" y="74" width="120" height="2" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0.75"/>
-    </fill>
-  </Rect>
-  <!-- highlight stroke -->
-  <Rect x="0.5" y="2.5" width="119" height="71" scaleX="2" scaleY="2">
-    <stroke>
-      <SolidColorStroke color="#000000" weight="1" alpha=".1"/>
-    </stroke>
-  </Rect>
-  <!-- scaling fix -->
-  <Rect x="0" y="0" width="120" height="76" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0"/>
-    </fill>
-  </Rect>
+
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridTop="4" scaleGridBottom="72" scaleGridLeft="3" scaleGridRight="117">
+    
+    <!-- highlight fill -->
+    <Rect x="0" y="2" width="120" height="72">
+        <fill>
+            <LinearGradient x="0" scaleX="72" rotation="90">
+                <GradientEntry color="#000000" ratio="0" alpha=".05"/>
+                <GradientEntry color="#000000" ratio="1" alpha=".1"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+    
+    <!-- border top -->
+    <Rect x="0" y="0" width="120" height="2">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.75"/>
+        </fill>
+    </Rect>
+    <!-- border bottom -->
+    <Rect x="0" y="74" width="120" height="2">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.75"/>
+        </fill>
+    </Rect>
+    
+    <!-- highlight stroke -->
+    <Rect x="0.5" y="2.5" width="119" height="71">
+    	<stroke>
+    		<SolidColorStroke color="#000000" weight="1" alpha=".1"/>
+    	</stroke>
+    </Rect>
+    
+    <!-- scaling fix -->
+    <Rect x="0" y="0" width="120" height="76">
+        <fill>
+    		<SolidColor color="#000000" alpha="0"/>
+        </fill>
+    </Rect>
+    
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TabbedViewNavigatorButtonBarFirstButton_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TabbedViewNavigatorButtonBarFirstButton_up.fxg
index 0bd7c98..aaa564d 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TabbedViewNavigatorButtonBarFirstButton_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TabbedViewNavigatorButtonBarFirstButton_up.fxg
@@ -18,38 +18,45 @@
 
 -->
 
-<Graphic version="2.0" scaleGridTop="4" scaleGridBottom="72" scaleGridLeft="3" scaleGridRight="117" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- highlight fill -->
-  <Rect x="0" y="2" width="120" height="72" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="0" scaleX="72" rotation="90">
-        <GradientEntry color="#ffffff" ratio="0" alpha=".2"/>
-        <GradientEntry color="#ffffff" ratio="1" alpha="0"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- border top -->
-  <Rect x="0" y="0" width="120" height="2" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0.75"/>
-    </fill>
-  </Rect>
-  <!-- border bottom -->
-  <Rect x="0" y="74" width="120" height="2" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0.75"/>
-    </fill>
-  </Rect>
-  <!-- highlight stroke -->
-  <Rect x="0.5" y="2.5" width="119" height="71" scaleX="2" scaleY="2">
-    <stroke>
-      <SolidColorStroke color="#ffffff" weight="1" alpha=".2"/>
-    </stroke>
-  </Rect>
-  <!-- scaling fix -->
-  <Rect x="0" y="0" width="120" height="76" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0"/>
-    </fill>
-  </Rect>
+
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridTop="4" scaleGridBottom="72" scaleGridLeft="3" scaleGridRight="117">
+    
+    <!-- highlight fill -->
+    <Rect x="0" y="2" width="120" height="72">
+        <fill>
+            <LinearGradient x="0" scaleX="72" rotation="90">
+                <GradientEntry color="#ffffff" ratio="0" alpha=".2"/>
+                <GradientEntry color="#ffffff" ratio="1" alpha="0"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+    
+    <!-- border top -->
+    <Rect x="0" y="0" width="120" height="2">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.75"/>
+        </fill>
+    </Rect>
+    <!-- border bottom -->
+    <Rect x="0" y="74" width="120" height="2">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.75"/>
+        </fill>
+    </Rect>
+    
+    <!-- highlight stroke -->
+    <Rect x="0.5" y="2.5" width="119" height="71">
+    	<stroke>
+    		<SolidColorStroke color="#ffffff" weight="1" alpha=".2"/>
+    	</stroke>
+    </Rect>
+    
+    <!-- scaling fix -->
+    <Rect x="0" y="0" width="120" height="76">
+        <fill>
+    		<SolidColor color="#000000" alpha="0"/>
+        </fill>
+    </Rect>
+    
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TabbedViewNavigatorButtonBarLastButton_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TabbedViewNavigatorButtonBarLastButton_down.fxg
index c65c015..b47587e 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TabbedViewNavigatorButtonBarLastButton_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TabbedViewNavigatorButtonBarLastButton_down.fxg
@@ -18,44 +18,51 @@
 
 -->
 
-<Graphic version="2.0" scaleGridTop="4" scaleGridBottom="72" scaleGridLeft="3" scaleGridRight="117" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- highlight fill -->
-  <Rect x="2" y="2" width="118" height="72" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="0" scaleX="72" rotation="90">
-        <GradientEntry color="#000000" ratio="0" alpha=".3"/>
-        <GradientEntry color="#000000" ratio="1" alpha=".15"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- border top -->
-  <Rect x="0" y="0" width="120" height="2" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0.75"/>
-    </fill>
-  </Rect>
-  <!-- border bottom -->
-  <Rect x="0" y="74" width="120" height="2" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0.75"/>
-    </fill>
-  </Rect>
-  <!-- border left -->
-  <Rect x="0" y="2" width="2" height="72" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0.8"/>
-    </fill>
-  </Rect>
-  <!-- highlight stroke -->
-  <Rect x="2.5" y="2.5" width="117" height="71" scaleX="2" scaleY="2">
-    <stroke>
-      <SolidColorStroke color="#000000" weight="1" alpha=".1"/>
-    </stroke>
-  </Rect>
-  <!-- scaling fix -->
-  <Rect x="0" y="0" width="120" height="76" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0"/>
-    </fill>
-  </Rect>
+
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridTop="4" scaleGridBottom="72" scaleGridLeft="3" scaleGridRight="117">
+    
+    <!-- highlight fill -->
+    <Rect x="2" y="2" width="118" height="72">
+        <fill>
+            <LinearGradient x="0" scaleX="72" rotation="90">
+                <GradientEntry color="#000000" ratio="0" alpha=".3"/>
+                <GradientEntry color="#000000" ratio="1" alpha=".15"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+    
+    <!-- border top -->
+    <Rect x="0" y="0" width="120" height="2">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.75"/>
+        </fill>
+    </Rect>
+    <!-- border bottom -->
+    <Rect x="0" y="74" width="120" height="2">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.75"/>
+        </fill>
+    </Rect>
+    <!-- border left -->
+    <Rect x="0" y="2" width="2" height="72">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.8"/>
+        </fill>
+    </Rect>
+    
+    <!-- highlight stroke -->
+    <Rect x="2.5" y="2.5" width="117" height="71">
+    	<stroke>
+    		<SolidColorStroke color="#000000" weight="1" alpha=".1"/>
+    	</stroke>
+    </Rect>
+    
+    <!-- scaling fix -->
+    <Rect x="0" y="0" width="120" height="76">
+        <fill>
+    		<SolidColor color="#000000" alpha="0"/>
+        </fill>
+    </Rect>
+    
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TabbedViewNavigatorButtonBarLastButton_selected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TabbedViewNavigatorButtonBarLastButton_selected.fxg
index 1d121b9..173b7eb 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TabbedViewNavigatorButtonBarLastButton_selected.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TabbedViewNavigatorButtonBarLastButton_selected.fxg
@@ -18,44 +18,51 @@
 
 -->
 
-<Graphic version="2.0" scaleGridTop="4" scaleGridBottom="72" scaleGridLeft="3" scaleGridRight="117" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- highlight fill -->
-  <Rect x="2" y="2" width="118" height="72" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="0" scaleX="72" rotation="90">
-        <GradientEntry color="#000000" ratio="0" alpha=".05"/>
-        <GradientEntry color="#000000" ratio="1" alpha=".1"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- border top -->
-  <Rect x="0" y="0" width="120" height="2" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0.75"/>
-    </fill>
-  </Rect>
-  <!-- border bottom -->
-  <Rect x="0" y="74" width="120" height="2" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0.75"/>
-    </fill>
-  </Rect>
-  <!-- border left -->
-  <Rect x="0" y="2" width="2" height="72" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0.8"/>
-    </fill>
-  </Rect>
-  <!-- highlight stroke -->
-  <Rect x="2.5" y="2.5" width="117" height="71" scaleX="2" scaleY="2">
-    <stroke>
-      <SolidColorStroke color="#000000" weight="1" alpha=".1"/>
-    </stroke>
-  </Rect>
-  <!-- scaling fix -->
-  <Rect x="0" y="0" width="120" height="76" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0"/>
-    </fill>
-  </Rect>
+
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridTop="4" scaleGridBottom="72" scaleGridLeft="3" scaleGridRight="117">
+    
+    <!-- highlight fill -->
+    <Rect x="2" y="2" width="118" height="72">
+        <fill>
+            <LinearGradient x="0" scaleX="72" rotation="90">
+                <GradientEntry color="#000000" ratio="0" alpha=".05"/>
+                <GradientEntry color="#000000" ratio="1" alpha=".1"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+    
+    <!-- border top -->
+    <Rect x="0" y="0" width="120" height="2">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.75"/>
+        </fill>
+    </Rect>
+    <!-- border bottom -->
+    <Rect x="0" y="74" width="120" height="2">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.75"/>
+        </fill>
+    </Rect>
+    <!-- border left -->
+    <Rect x="0" y="2" width="2" height="72">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.8"/>
+        </fill>
+    </Rect>
+    
+    <!-- highlight stroke -->
+    <Rect x="2.5" y="2.5" width="117" height="71">
+    	<stroke>
+    		<SolidColorStroke color="#000000" weight="1" alpha=".1"/>
+    	</stroke>
+    </Rect>
+    
+    <!-- scaling fix -->
+    <Rect x="0" y="0" width="120" height="76">
+        <fill>
+    		<SolidColor color="#000000" alpha="0"/>
+        </fill>
+    </Rect>
+    
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TabbedViewNavigatorButtonBarLastButton_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TabbedViewNavigatorButtonBarLastButton_up.fxg
index 828e459..54d9365 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TabbedViewNavigatorButtonBarLastButton_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TabbedViewNavigatorButtonBarLastButton_up.fxg
@@ -18,44 +18,51 @@
 
 -->
 
-<Graphic version="2.0" scaleGridTop="4" scaleGridBottom="72" scaleGridLeft="3" scaleGridRight="117" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- highlight fill -->
-  <Rect x="2" y="2" width="118" height="72" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="0" scaleX="72" rotation="90">
-        <GradientEntry color="#ffffff" ratio="0" alpha=".2"/>
-        <GradientEntry color="#ffffff" ratio="1" alpha="0"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- border top -->
-  <Rect x="0" y="0" width="120" height="2" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0.75"/>
-    </fill>
-  </Rect>
-  <!-- border bottom -->
-  <Rect x="0" y="74" width="120" height="2" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0.75"/>
-    </fill>
-  </Rect>
-  <!-- border left -->
-  <Rect x="0" y="2" width="2" height="72" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0.8"/>
-    </fill>
-  </Rect>
-  <!-- highlight stroke -->
-  <Rect x="2.5" y="2.5" width="117" height="71" scaleX="2" scaleY="2">
-    <stroke>
-      <SolidColorStroke color="#ffffff" weight="1" alpha=".2"/>
-    </stroke>
-  </Rect>
-  <!-- scaling fix -->
-  <Rect x="0" y="0" width="120" height="76" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0"/>
-    </fill>
-  </Rect>
+
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridTop="4" scaleGridBottom="72" scaleGridLeft="3" scaleGridRight="117">
+    
+    <!-- highlight fill -->
+    <Rect x="2" y="2" width="118" height="72">
+        <fill>
+            <LinearGradient x="0" scaleX="72" rotation="90">
+                <GradientEntry color="#ffffff" ratio="0" alpha=".2"/>
+                <GradientEntry color="#ffffff" ratio="1" alpha="0"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+    
+    <!-- border top -->
+    <Rect x="0" y="0" width="120" height="2">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.75"/>
+        </fill>
+    </Rect>
+    <!-- border bottom -->
+    <Rect x="0" y="74" width="120" height="2">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.75"/>
+        </fill>
+    </Rect>
+    <!-- border left -->
+    <Rect x="0" y="2" width="2" height="72">
+        <fill>
+    		<SolidColor color="#000000" alpha="0.8"/>
+        </fill>
+    </Rect>
+    
+    <!-- highlight stroke -->
+    <Rect x="2.5" y="2.5" width="117" height="71">
+    	<stroke>
+    		<SolidColorStroke color="#ffffff" weight="1" alpha=".2"/>
+    	</stroke>
+    </Rect>
+    
+    <!-- scaling fix -->
+    <Rect x="0" y="0" width="120" height="76">
+        <fill>
+    		<SolidColor color="#000000" alpha="0"/>
+        </fill>
+    </Rect>
+    
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TextInput_border.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TextInput_border.fxg
index 1ef91d0..eecb9b9 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TextInput_border.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TextInput_border.fxg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,17 +18,22 @@
 
 -->
 
-<Graphic version="2.0" scaleGridLeft="16" scaleGridTop="16" scaleGridRight="504" scaleGridBottom="50" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- border -->
-  <Path data="M12 2 508 2C514 2 518 6 518 12L518 54C518 60 514 64 508 64L12 64C6 64 2 60 2 54L2 12C2 6 6 2 12 2ZM12 0C6 0 0 6 0 12L0 54C0 60 6 66 12 66L508 66C514 66 520 60 520 54L520 12C520 6 514 0 508 0L12 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#505050"/>
-    </fill>
-  </Path>
-  <!-- inner shadow -->
-  <Path x="2" y="2" alpha="0.2" data="M10 3 506 3C510 3 514 7 514 11L514 52C514 56 510 60 506 60L10 60C6 60 2 56 2 52L2 11C2 7 6 3 10 3ZM10 0C4 0 0 4 0 10L0 52C0 58 4 62 10 62L506 62C512 62 516 58 516 52L516 10C516 4 512 0 506 0L10 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#030303"/>
-    </fill>
-  </Path>
+
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+         scaleGridLeft="16" scaleGridTop="16" scaleGridRight="504" scaleGridBottom="50">
+         
+    <!-- border -->
+    <Path data="M12 2 508 2C514 2 518 6 518 12L518 54C518 60 514 64 508 64L12 64C6 64 2 60 2 54L2 12C2 6 6 2 12 2ZM12 0C6 0 0 6 0 12L0 54C0 60 6 66 12 66L508 66C514 66 520 60 520 54L520 12C520 6 514 0 508 0L12 0Z">
+        <fill>
+            <SolidColor color="#505050"/>
+        </fill>
+    </Path>
+      
+    <!-- inner shadow -->
+    <Path x="2" y="2" alpha="0.2" data="M10 3 506 3C510 3 514 7 514 11L514 52C514 56 510 60 506 60L10 60C6 60 2 56 2 52L2 11C2 7 6 3 10 3ZM10 0C4 0 0 4 0 10L0 52C0 58 4 62 10 62L506 62C512 62 516 58 516 52L516 10C516 4 512 0 506 0L10 0Z">
+        <fill>
+            <SolidColor color="#030303"/>
+        </fill>
+    </Path>
+     
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ToggleSwitch_contentShadow.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ToggleSwitch_contentShadow.fxg
index 2234a7d..bd26d9a 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ToggleSwitch_contentShadow.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ToggleSwitch_contentShadow.fxg
@@ -17,15 +17,14 @@
   limitations under the License.
 
 -->
-
-<Graphic version="2.0" viewHeight="56" viewWidth="142" scaleGridLeft="28" scaleGridTop="20" scaleGridRight="114" scaleGridBottom="28" xmlns="http://ns.adobe.com/fxg/2008">
-  <Path winding="nonZero" data="M0 0 0 56 28 56C20 56 14 49.7324 14 42 14 34.2676 20 28 28 28L114 28C122 28 128 34.2676 128 42 128 49.7324 122 56 114 56L142 56 142 0 0 0Z" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient rotation="90">
-        <GradientEntry ratio="0" alpha="0.1"/>
-        <GradientEntry ratio="0.5" alpha="0.2"/>
-        <GradientEntry ratio="1" alpha="0.1"/>
-      </LinearGradient>
-    </fill>
-  </Path>
+<Graphic version="2.0" viewHeight="56" viewWidth="142" xmlns="http://ns.adobe.com/fxg/2008" scaleGridLeft="28" scaleGridTop="20" scaleGridRight="114" scaleGridBottom="28">
+	<Path winding="nonZero" data="M0 0 0 56 28 56C20 56 14 49.7324 14 42 14 34.2676 20 28 28 28L114 28C122 28 128 34.2676 128 42 128 49.7324 122 56 114 56L142 56 142 0 0 0Z">
+		<fill>
+			<LinearGradient rotation="90">
+				<GradientEntry ratio="0" alpha="0.1"/>
+				<GradientEntry ratio="0.5" alpha="0.2"/>
+				<GradientEntry ratio="1" alpha="0.1"/>
+			</LinearGradient>
+		</fill>
+	</Path>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TransparentActionButton_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TransparentActionButton_down.fxg
index 048061d..d6f0fda 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TransparentActionButton_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TransparentActionButton_down.fxg
@@ -18,45 +18,52 @@
 
 -->
 
-<Graphic version="2.0" scaleGridTop="6" scaleGridBottom="59" scaleGridLeft="9" scaleGridRight="76" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- highlight border leading -->
-  <Rect x="0" y="1" width="1" height="63" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="0" scaleX="63" rotation="90">
-        <GradientEntry color="#ffffff" ratio="0" alpha=".15"/>
-        <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- separator dark -->
-  <Rect x="1" y="0" width="2" height="65" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0.8"/>
-    </fill>
-  </Rect>
-  <!-- inner shaddow -->
-  <Rect x="3" y="0" width="80" height="65" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="0" scaleX="65" rotation="90">
-        <GradientEntry color="#000000" ratio="0" alpha=".05"/>
-        <GradientEntry color="#000000" ratio="1" alpha=".25"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <Rect x="3.5" y="0.5" width="79" height="64" alpha="0.2" scaleX="2" scaleY="2">
-    <stroke>
-      <SolidColorStroke color="#000000" weight="1" caps="none" joints="miter"/>
-    </stroke>
-  </Rect>
-  <Rect x="4.5" y="1.5" width="77" height="62" alpha="0.1" scaleX="2" scaleY="2">
-    <stroke>
-      <SolidColorStroke color="#000000" weight="1" caps="none" joints="miter"/>
-    </stroke>
-  </Rect>
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="0" width="83" height="65" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
+
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridTop="6" scaleGridBottom="59" scaleGridLeft="9" scaleGridRight="76">
+    
+    <!-- highlight border leading -->
+    <Rect x="0" y="1" width="1" height="63">
+        <fill>
+            <LinearGradient x="0" scaleX="63" rotation="90">
+                <GradientEntry color="#ffffff" ratio="0" alpha=".15"/>
+                <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+    
+    <!-- separator dark -->
+    <Rect x="1" y="0" width="2" height="65">
+        <fill>
+            <SolidColor color="#000000" alpha="0.8"/>
+        </fill>
+    </Rect>
+    
+    <!-- inner shaddow -->
+    <Rect x="3" y="0" width="80" height="65">
+        <fill>
+            <LinearGradient x="0" scaleX="65" rotation="90">
+                <GradientEntry color="#000000" ratio="0" alpha=".05"/>
+                <GradientEntry color="#000000" ratio="1" alpha=".25"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+    
+    <Rect x="3.5" y="0.5" width="79" height="64" alpha="0.2">
+        <stroke>
+            <SolidColorStroke color="#000000" weight="1" caps="none" joints="miter"/>
+        </stroke>
+    </Rect>
+    <Rect x="4.5" y="1.5" width="77" height="62" alpha="0.1">
+        <stroke>
+            <SolidColorStroke color="#000000" weight="1" caps="none" joints="miter"/>
+        </stroke>
+    </Rect>
+
+    <!-- invisible fix for scaling -->
+    <Rect x="0" y="0" width="83" height="65">
+        <fill>
+            <SolidColor color="#ffffff" alpha="0"/>
+        </fill>
+    </Rect>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TransparentActionButton_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TransparentActionButton_up.fxg
index 7c653e3..d177333 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TransparentActionButton_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TransparentActionButton_up.fxg
@@ -18,35 +18,42 @@
 
 -->
 
-<Graphic version="2.0" scaleGridTop="1" scaleGridBottom="64" scaleGridLeft="4" scaleGridRight="82" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- highlight border leading -->
-  <Rect x="0" y="1" width="1" height="63" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="0" scaleX="63" rotation="90">
-        <GradientEntry color="#ffffff" ratio="0" alpha=".25"/>
-        <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- separator dark -->
-  <Rect x="1" y="0" width="2" height="65" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0.8"/>
-    </fill>
-  </Rect>
-  <!-- highlight border left-->
-  <Rect x="3" y="1" width="1" height="63" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="0" scaleX="63" rotation="90">
-        <GradientEntry color="#ffffff" ratio="0" alpha=".25"/>
-        <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="0" width="83" height="65" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
+
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridTop="1" scaleGridBottom="64" scaleGridLeft="4" scaleGridRight="82" >
+    
+    <!-- highlight border leading -->
+    <Rect x="0" y="1" width="1" height="63">
+        <fill>
+            <LinearGradient x="0" scaleX="63" rotation="90">
+                <GradientEntry color="#ffffff" ratio="0" alpha=".25"/>
+                <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+    
+    <!-- separator dark -->
+    <Rect x="1" y="0" width="2" height="65">
+        <fill>
+            <SolidColor color="#000000" alpha="0.8"/>
+        </fill>
+    </Rect>
+	
+	<!-- highlight border left-->
+    <Rect x="3" y="1" width="1" height="63">
+        <fill>
+            <LinearGradient x="0" scaleX="63" rotation="90">
+                <GradientEntry color="#ffffff" ratio="0" alpha=".25"/>
+                <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+
+	<!-- invisible fix for scaling -->
+	<Rect x="0" y="0" width="83" height="65">
+		<fill>
+			<SolidColor color="#ffffff" alpha="0"/>
+		</fill>
+	</Rect>
+	
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TransparentNavigationButton_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TransparentNavigationButton_down.fxg
index 1903241..2be2a93 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TransparentNavigationButton_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TransparentNavigationButton_down.fxg
@@ -18,45 +18,52 @@
 
 -->
 
-<Graphic version="2.0" scaleGridTop="6" scaleGridBottom="59" scaleGridLeft="6" scaleGridRight="74" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- inner shaddow -->
-  <Rect x="0" y="0" width="80" height="65" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="0" scaleX="65" rotation="90">
-        <GradientEntry color="#000000" ratio="0" alpha=".05"/>
-        <GradientEntry color="#000000" ratio="1" alpha=".25"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <Rect x="0.5" y="0.5" width="79" height="64" alpha="0.2" scaleX="2" scaleY="2">
-    <stroke>
-      <SolidColorStroke color="#000000" weight="1" caps="none" joints="miter"/>
-    </stroke>
-  </Rect>
-  <Rect x="1.5" y="1.5" width="77" height="62" alpha="0.1" scaleX="2" scaleY="2">
-    <stroke>
-      <SolidColorStroke color="#000000" weight="1" caps="none" joints="miter"/>
-    </stroke>
-  </Rect>
-  <!-- separator dark -->
-  <Rect x="80" y="0" width="2" height="65" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0.8"/>
-    </fill>
-  </Rect>
-  <!-- highlight border trailing -->
-  <Rect x="82" y="1" width="1" height="63" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="0" scaleX="63" rotation="90">
-        <GradientEntry color="#ffffff" ratio="0" alpha=".25"/>
-        <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="1" width="83" height="63" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
+
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridTop="6" scaleGridBottom="59" scaleGridLeft="6" scaleGridRight="74">
+    
+    <!-- inner shaddow -->
+    <Rect x="0" y="0" width="80" height="65">
+        <fill>
+            <LinearGradient x="0" scaleX="65" rotation="90">
+                <GradientEntry color="#000000" ratio="0" alpha=".05"/>
+                <GradientEntry color="#000000" ratio="1" alpha=".25"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+    
+    <Rect x="0.5" y="0.5" width="79" height="64" alpha="0.2">
+        <stroke>
+            <SolidColorStroke color="#000000" weight="1" caps="none" joints="miter"/>
+        </stroke>
+    </Rect>
+    <Rect x="1.5" y="1.5" width="77" height="62" alpha="0.1">
+        <stroke>
+            <SolidColorStroke color="#000000" weight="1" caps="none" joints="miter"/>
+        </stroke>
+    </Rect>
+    
+    <!-- separator dark -->
+    <Rect x="80" y="0" width="2" height="65">
+        <fill>
+            <SolidColor color="#000000" alpha="0.8"/>
+        </fill>
+    </Rect>
+    
+    <!-- highlight border trailing -->
+    <Rect x="82" y="1" width="1" height="63">
+        <fill>
+            <LinearGradient x="0" scaleX="63" rotation="90">
+                <GradientEntry color="#ffffff" ratio="0" alpha=".25"/>
+                <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+
+    <!-- invisible fix for scaling -->
+    <Rect x="0" y="1" width="83" height="63">
+        <fill>
+            <SolidColor color="#ffffff" alpha="0"/>
+        </fill>
+    </Rect>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TransparentNavigationButton_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TransparentNavigationButton_up.fxg
index ddc552a..cb3d304 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TransparentNavigationButton_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/TransparentNavigationButton_up.fxg
@@ -18,35 +18,42 @@
 
 -->
 
-<Graphic version="2.0" scaleGridTop="1" scaleGridBottom="64" scaleGridLeft="1" scaleGridRight="79" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- highlight border right -->
-  <Rect x="79" y="1" width="1" height="63" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="0" scaleX="63" rotation="90">
-        <GradientEntry color="#ffffff" ratio="0" alpha=".25"/>
-        <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- separator dark -->
-  <Rect x="80" y="0" width="2" height="65" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0.8"/>
-    </fill>
-  </Rect>
-  <!-- highlight border trailing -->
-  <Rect x="82" y="1" width="1" height="63" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient x="0" scaleX="63" rotation="90">
-        <GradientEntry color="#ffffff" ratio="0" alpha=".25"/>
-        <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- invisible fix for scaling -->
-  <Rect x="0" y="0" width="83" height="65" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#ffffff" alpha="0"/>
-    </fill>
-  </Rect>
+
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+    scaleGridTop="1" scaleGridBottom="64" scaleGridLeft="1" scaleGridRight="79" >
+    
+	<!-- highlight border right -->
+    <Rect x="79" y="1" width="1" height="63">
+        <fill>
+            <LinearGradient x="0" scaleX="63" rotation="90">
+                <GradientEntry color="#ffffff" ratio="0" alpha=".25"/>
+                <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+    
+    <!-- separator dark -->
+    <Rect x="80" y="0" width="2" height="65">
+        <fill>
+            <SolidColor color="#000000" alpha="0.8"/>
+        </fill>
+    </Rect>
+    
+    <!-- highlight border trailing -->
+    <Rect x="82" y="1" width="1" height="63">
+        <fill>
+            <LinearGradient x="0" scaleX="63" rotation="90">
+                <GradientEntry color="#ffffff" ratio="0" alpha=".25"/>
+                <GradientEntry color="#ffffff" ratio="1" alpha=".1"/>
+            </LinearGradient>
+        </fill>
+    </Rect>
+
+	<!-- invisible fix for scaling -->
+	<Rect x="0" y="0" width="83" height="65">
+		<fill>
+			<SolidColor color="#ffffff" alpha="0"/>
+		</fill>
+	</Rect>
+	
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ViewMenuItem_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ViewMenuItem_down.fxg
index f25e287..5deda34 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ViewMenuItem_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ViewMenuItem_down.fxg
@@ -17,33 +17,38 @@
   limitations under the License.
 
 -->
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+	scaleGridLeft="6" scaleGridRight="152" scaleGridTop="6" scaleGridBottom="94">
+	
+	<!-- Transparent Rect to ensure proper scaling -->
+	<Rect width="158" height="100" x="0" y="0">
+		<fill>
+			<SolidColor color="#000000" alpha="0"/>
+		</fill>
+	</Rect>	
+	
+	<!-- overlay -->	
+	<Rect width="158" height="100" x="0" y="0">
+		<fill>
+			<LinearGradient rotation = "90">
+				<GradientEntry color="#000000" ratio="0" alpha="0.25"/>
+				<GradientEntry color="#000000" ratio="1" alpha="0.05"/>
+			</LinearGradient>
+		</fill>
+	</Rect>
 
-<Graphic version="2.0" scaleGridLeft="6" scaleGridRight="152" scaleGridTop="6" scaleGridBottom="94" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- Transparent Rect to ensure proper scaling -->
-  <Rect width="158" height="100" x="0" y="0" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- overlay -->
-  <Rect width="158" height="100" x="0" y="0" scaleX="2" scaleY="2">
-    <fill>
-      <LinearGradient rotation="90">
-        <GradientEntry color="#000000" ratio="0" alpha="0.25"/>
-        <GradientEntry color="#000000" ratio="1" alpha="0.05"/>
-      </LinearGradient>
-    </fill>
-  </Rect>
-  <!-- Outermost border -->
-  <Rect width="156" height="98" x="1" y="1" scaleX="2" scaleY="2">
-    <stroke>
-      <SolidColorStroke color="#000000" weight="2" alpha="0.2" joints="miter"/>
-    </stroke>
-  </Rect>
-  <!-- Middle Outer Border -->
-  <Rect width="152" height="94" x="3" y="3" scaleX="2" scaleY="2">
-    <stroke>
-      <SolidColorStroke color="#000000" weight="2" alpha="0.1" joints="miter"/>
-    </stroke>
-  </Rect>
+	<!-- Outermost border -->
+	<Rect width="156" height="98" x="1" y="1">
+		<stroke>
+			<SolidColorStroke color="#000000" weight="2" alpha="0.2" joints="miter"/>
+		</stroke>
+	</Rect>
+	
+	<!-- Middle Outer Border -->
+	<Rect width="152" height="94" x="3" y="3">
+		<stroke>
+			<SolidColorStroke color="#000000" weight="2" alpha="0.1" joints="miter"/>
+		</stroke>
+	</Rect>
+
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ViewMenuItem_showsCaret.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ViewMenuItem_showsCaret.fxg
index cd38333..49af087 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ViewMenuItem_showsCaret.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ViewMenuItem_showsCaret.fxg
@@ -17,18 +17,20 @@
   limitations under the License.
 
 -->
-
-<Graphic version="2.0" scaleGridLeft="3" scaleGridRight="155" scaleGridTop="3" scaleGridBottom="97" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- Transparent Rect to ensure proper scaling -->
-  <Rect width="158" height="100" x="0" y="0" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- Border -->
-  <Rect width="156" height="98" x="1" y="1" scaleX="2" scaleY="2">
-    <stroke>
-      <SolidColorStroke weight="2" color="#ffffff" alpha=".25" joints="miter"/>
-    </stroke>
-  </Rect>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+	scaleGridLeft="3" scaleGridRight="155" scaleGridTop="3" scaleGridBottom="97">
+	
+	<!-- Transparent Rect to ensure proper scaling --> 
+	<Rect width="158" height="100" x="0" y="0">
+		<fill>
+			<SolidColor color="#000000" alpha="0"/>
+		</fill>
+	</Rect>
+	
+	<!-- Border -->
+	<Rect width="156" height="98" x="1" y="1">
+		<stroke>
+			<SolidColorStroke weight="2" color="#ffffff" alpha=".25" joints="miter"/>
+		</stroke>
+	</Rect>
 </Graphic>
\ No newline at end of file
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ViewMenuItem_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ViewMenuItem_up.fxg
index cd38333..55ccaf9 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ViewMenuItem_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile640/assets/ViewMenuItem_up.fxg
@@ -17,18 +17,21 @@
   limitations under the License.
 
 -->
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"
+	scaleGridLeft="3" scaleGridRight="155" scaleGridTop="3" scaleGridBottom="97">
 
-<Graphic version="2.0" scaleGridLeft="3" scaleGridRight="155" scaleGridTop="3" scaleGridBottom="97" xmlns="http://ns.adobe.com/fxg/2008">
-  <!-- Transparent Rect to ensure proper scaling -->
-  <Rect width="158" height="100" x="0" y="0" scaleX="2" scaleY="2">
-    <fill>
-      <SolidColor color="#000000" alpha="0"/>
-    </fill>
-  </Rect>
-  <!-- Border -->
-  <Rect width="156" height="98" x="1" y="1" scaleX="2" scaleY="2">
-    <stroke>
-      <SolidColorStroke weight="2" color="#ffffff" alpha=".25" joints="miter"/>
-    </stroke>
-  </Rect>
+	<!-- Transparent Rect to ensure proper scaling -->
+	<Rect width="158" height="100" x="0" y="0">
+		<fill>
+			<SolidColor color="#000000" alpha="0"/>
+		</fill>
+	</Rect>
+
+	<!-- Border -->
+	<Rect width="156" height="98" x="1" y="1">
+		<stroke>
+			<SolidColorStroke weight="2" color="#ffffff" alpha=".25" joints="miter"/>
+		</stroke>
+	</Rect>
+
 </Graphic>
\ No newline at end of file