26 files changed, 660 insertions, 623 deletions

diff --git a/css/ninja.css b/css/ninja.css
index 29cdcd02..288156b6 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -6,16 +6,11 @@ All Rights Reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
-* Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
 
-* Neither the name of Motorola Mobility LLC nor the names of its
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission.
+* Neither the name of Motorola Mobility LLC nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
diff --git a/index.html b/index.html
index 6058408d..8c2de1f6 100755
--- a/index.html
+++ b/index.html
@@ -111,8 +111,8 @@ POSSIBILITY OF SUCH DAMAGE.
             {
                 margin: 0 auto;
                 margin-top: 10%;
-                width: 675px;
-                height: 420px;
+                width: 580px;
+                height: 430px;
 
                 border-radius: 3px;
 
@@ -139,7 +139,7 @@ POSSIBILITY OF SUCH DAMAGE.
                 position: relative;
                 width: 700px;
                 top: -10px;
-                margin: 30px;
+                margin: 0px 30px;
             }
 
             #splashScreenTextBlock p:first-child
@@ -304,6 +304,7 @@ POSSIBILITY OF SUCH DAMAGE.
         <div id="ninja_logo"></div>
     
         <div id="splashScreenTextBlock" class="baseSplashScreenText">
+            <p class="mediumSplashScreenText">Ninja&trade;</p>
             <p class="mediumSplashScreenText">Version: <span id="splashScreenVersionNumber">0.0.0.0</span></p>
             <p>Copyright &copy 2012 Motorola Mobility LLC. All rights reserved.</p>
             <p>The Ninja application is made possible by the <a href="http://tetsubo.org/go/ninjaland" target="_blank" class="splashScreenAnchor">Ninja open source project</a> and <a href="credits.html" target="_blank" class="splashScreenAnchor">other open source software</a>.</p>
diff --git a/js/components/about-box.reel/about-box.css b/js/components/about-box.reel/about-box.css
index efce5107..462fd578 100644
--- a/js/components/about-box.reel/about-box.css
+++ b/js/components/about-box.reel/about-box.css
@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
 .mainAboutBoxContainer
 {
     width: 580px;
-    height: 420px;
+    height: 430px;
 
     border-radius: 3px;
 
@@ -67,7 +67,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #aboutBoxTextBlock
 {
     position: relative;
-    margin: 30px;
+    margin: 0px 30px;
 }
 
 #aboutBoxTextBlock p:first-child
diff --git a/js/components/about-box.reel/about-box.html b/js/components/about-box.reel/about-box.html
index a00748c8..68220086 100644
--- a/js/components/about-box.reel/about-box.html
+++ b/js/components/about-box.reel/about-box.html
@@ -49,6 +49,7 @@ POSSIBILITY OF SUCH DAMAGE.
 <div data-montage-id="mainAboutBoxContainer" class="mainAboutBoxContainer">
     <div id="about_box_ninja_logo"></div>
     <div id="aboutBoxTextBlock" class="baseAboutBoxText">
+        <p class="mediumAboutBoxText">Ninja&trade;</p>
         <p class="mediumAboutBoxText">Version: <span id="aboutBoxVersionNumber">0.0.0.0</span></p>
         <p>Copyright &copy 2012 Motorola Mobility LLC. All rights reserved.</p>
         <p>The Ninja application is made possible by the <a href="http://tetsubo.org/go/ninjaland" target="_blank" class="aboutBoxAnchor">Ninja open source project</a> and <a href="credits.html" target="_blank" class="aboutBoxAnchor">other open source software</a>.</p>
diff --git a/scss/imports/codemirror/_codemirror.scss b/scss/imports/codemirror/_codemirror.scss
index 58d60b55..e40b01bc 100755
--- a/scss/imports/codemirror/_codemirror.scss
+++ b/scss/imports/codemirror/_codemirror.scss
@@ -1,33 +1,35 @@
-/* <copyright>
-Copyright (c) 2012, Motorola Mobility LLC.
-All Rights Reserved.
+@charset "UTF-8";
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of Motorola Mobility LLC nor the names of its
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-</copyright> */
+// <copyright>
+// Copyright (c) 2012, Motorola Mobility LLC.
+// All Rights Reserved.
+// 
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+// 
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// 
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// 
+// * Neither the name of Motorola Mobility LLC nor the names of its
+//   contributors may be used to endorse or promote products derived from this
+//   software without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+// </copyright> 
 
 .CodeMirror {
   overflow: auto;
diff --git a/scss/imports/codemirror/_css.scss b/scss/imports/codemirror/_css.scss
index f92de35d..49f9f0b6 100755
--- a/scss/imports/codemirror/_css.scss
+++ b/scss/imports/codemirror/_css.scss
@@ -1,33 +1,35 @@
-/* <copyright>
-Copyright (c) 2012, Motorola Mobility LLC.
-All Rights Reserved.
+@charset "UTF-8";
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of Motorola Mobility LLC nor the names of its
+// <copyright>
+// Copyright (c) 2012, Motorola Mobility LLC.
+// All Rights Reserved.
+// 
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+// 
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// 
+// * Redistributions in binary form must reproduce the above copyright notice,