diff --git a/Objective-J/CPLog.js b/Objective-J/CPLog.js
index 8ad4ec238..b4d69c84f 100644
--- a/Objective-J/CPLog.js
+++ b/Objective-J/CPLog.js
@@ -357,3 +357,10 @@ function _CPLogInitPopup(logWindow)
     }, false);
 }
 #endif
+
+
+#if COMMONJS
+CPLogDefault = CPLogPrint;
+#else
+CPLogDefault = (typeof window === "object" && window.console) ? CPLogConsole : CPLogPopup;
+#endif
diff --git a/Objective-J/Debug.js b/Objective-J/Debug.js
index 27af496b9..68f5aa5d0 100644
--- a/Objective-J/Debug.js
+++ b/Objective-J/Debug.js
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+CPLogRegister(CPLogDefault);
+
 // formatting helpers
 
 function objj_debug_object_format(aReceiver)
diff --git a/Tools/capp/Resources/Templates/Application/index-debug.html b/Tools/capp/Resources/Templates/Application/index-debug.html
index 0bd1d11fe..a0e57f42c 100644
--- a/Tools/capp/Resources/Templates/Application/index-debug.html
+++ b/Tools/capp/Resources/Templates/Application/index-debug.html
@@ -35,6 +35,13 @@
 
             // Uncomment (along with both above) to print backtraces on type check errors:
             //objj_typecheck_prints_backtrace = true;
+
+            // Uncomment to disable the default logger (CPLogConsole if window.console exists, CPLogPopup otherwise):
+            //CPLogUnregister(CPLogDefault);
+
+            // Uncomment to enable a specific logger:
+            //CPLogRegister(CPLogConsole);
+            //CPLogRegister(CPLogPopup);
         </script>
         
         <style type="text/css">
diff --git a/Tools/capp/Resources/Templates/Application/index.html b/Tools/capp/Resources/Templates/Application/index.html
index 4963e50b5..c085e19b3 100644
--- a/Tools/capp/Resources/Templates/Application/index.html
+++ b/Tools/capp/Resources/Templates/Application/index.html
@@ -19,7 +19,7 @@
             OBJJ_MAIN_FILE = "main.j";
         </script>
         
-        <script src="Frameworks/Objective-J/Objective-J.js" type = "text/javascript"></script>
+        <script src="Frameworks/Objective-J/Objective-J.js" type="text/javascript"></script>
 
         <style type="text/css">
             body{margin:0; padding:0;}
diff --git a/Tools/capp/Resources/Templates/NibApplication/index-debug.html b/Tools/capp/Resources/Templates/NibApplication/index-debug.html
index 818092472..a40c42872 100644
--- a/Tools/capp/Resources/Templates/NibApplication/index-debug.html
+++ b/Tools/capp/Resources/Templates/NibApplication/index-debug.html
@@ -20,7 +20,7 @@
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
         
-        <script src="Frameworks/Debug/Objective-J/Objective-J.js" type = "text/javascript"></script>
+        <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript"></script>
 
         <script type="text/javascript">
             objj_msgSend_reset();
@@ -35,6 +35,13 @@
 
             // Uncomment (along with both above) to print backtraces on type check errors:
             //objj_typecheck_prints_backtrace = true;
+
+            // Uncomment to disable the default logger (CPLogConsole if window.console exists, CPLogPopup otherwise):
+            //CPLogUnregister(CPLogDefault);
+
+            // Uncomment to enable a specific logger:
+            //CPLogRegister(CPLogConsole);
+            //CPLogRegister(CPLogPopup);
         </script>
 
         <style type="text/css">
diff --git a/Tools/capp/Resources/Templates/NibApplication/index.html b/Tools/capp/Resources/Templates/NibApplication/index.html
index 5d20ebbc8..bfd3c8436 100644
--- a/Tools/capp/Resources/Templates/NibApplication/index.html
+++ b/Tools/capp/Resources/Templates/NibApplication/index.html
@@ -19,7 +19,7 @@
             OBJJ_MAIN_FILE = "main.j";
         </script>
         
-        <script src="Frameworks/Objective-J/Objective-J.js" type = "text/javascript"></script>
+        <script src="Frameworks/Objective-J/Objective-J.js" type="text/javascript"></script>
 
         <style type="text/css">
             body{margin:0; padding:0;}
diff --git a/Tools/capp/Resources/Templates/ThemeDescriptor/index-debug.html b/Tools/capp/Resources/Templates/ThemeDescriptor/index-debug.html
index 17d0d9f2b..4ae38bc63 100644
--- a/Tools/capp/Resources/Templates/ThemeDescriptor/index-debug.html
+++ b/Tools/capp/Resources/Templates/ThemeDescriptor/index-debug.html
@@ -20,7 +20,7 @@
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
         
-        <script src="Frameworks/Debug/Objective-J/Objective-J.js" type = "text/javascript"></script>
+        <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript"></script>
 
         <style type="text/css">
             body{margin:0; padding:0;}
diff --git a/Tools/capp/Resources/Templates/ThemeDescriptor/index.html b/Tools/capp/Resources/Templates/ThemeDescriptor/index.html
index 5d20ebbc8..bfd3c8436 100644
--- a/Tools/capp/Resources/Templates/ThemeDescriptor/index.html
+++ b/Tools/capp/Resources/Templates/ThemeDescriptor/index.html
@@ -19,7 +19,7 @@
             OBJJ_MAIN_FILE = "main.j";
         </script>
         
-        <script src="Frameworks/Objective-J/Objective-J.js" type = "text/javascript"></script>
+        <script src="Frameworks/Objective-J/Objective-J.js" type="text/javascript"></script>
 
         <style type="text/css">
             body{margin:0; padding:0;}