diff --git a/Tools/capp/Resources/Templates/Application/index-debug.html b/Tools/capp/Resources/Templates/Application/index-debug.html
index 33b76c2a7..871c9f72d 100644
--- a/Tools/capp/Resources/Templates/Application/index-debug.html
+++ b/Tools/capp/Resources/Templates/Application/index-debug.html
@@ -26,9 +26,9 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script>
-        
+
         <script type="text/javascript">
             objj_msgSend_reset();
 
@@ -36,7 +36,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -53,7 +53,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -79,7 +79,7 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading __project.name__...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
diff --git a/Tools/capp/Resources/Templates/Application/index.html b/Tools/capp/Resources/Templates/Application/index.html
index 0a3a175d4..ef3f12912 100644
--- a/Tools/capp/Resources/Templates/Application/index.html
+++ b/Tools/capp/Resources/Templates/Application/index.html
@@ -25,7 +25,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -53,7 +53,7 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading __project.name__...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
diff --git a/Tools/capp/Resources/Templates/NibApplication/AppController.j b/Tools/capp/Resources/Templates/NibApplication/AppController.j
index 6cd675cf0..144c16be8 100644
--- a/Tools/capp/Resources/Templates/NibApplication/AppController.j
+++ b/Tools/capp/Resources/Templates/NibApplication/AppController.j
@@ -23,10 +23,10 @@
 {
     // This is called when the cib is done loading.
     // You can implement this method on any object instantiated from a Cib.
-    // It's a useful hook for setting up current UI values, and other things. 
-    
+    // It's a useful hook for setting up current UI values, and other things.
+
     // In this case, we want the window from Cib to become our full browser window
-    [theWindow setFullBridge:YES];
+    [theWindow setFullPlatformWindow:YES];
 }
 
 @end
diff --git a/Tools/capp/Resources/Templates/NibApplication/index-debug.html b/Tools/capp/Resources/Templates/NibApplication/index-debug.html
index 83f9ff421..2ad737f6b 100644
--- a/Tools/capp/Resources/Templates/NibApplication/index-debug.html
+++ b/Tools/capp/Resources/Templates/NibApplication/index-debug.html
@@ -26,7 +26,7 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Debug/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <script type="text/javascript">
@@ -36,7 +36,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -53,7 +53,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -79,7 +79,7 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading __project.name__...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
diff --git a/Tools/capp/Resources/Templates/NibApplication/index.html b/Tools/capp/Resources/Templates/NibApplication/index.html
index 6b239b45e..e8aa7d028 100644
--- a/Tools/capp/Resources/Templates/NibApplication/index.html
+++ b/Tools/capp/Resources/Templates/NibApplication/index.html
@@ -25,7 +25,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -53,7 +53,7 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading __project.name__...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">