diff --git a/ui (gen4)/features/_feature.js b/ui (gen4)/features/_feature.js
index c467964f..39c4d8d7 100755
--- a/ui (gen4)/features/_feature.js	
+++ b/ui (gen4)/features/_feature.js	
@@ -3,10 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 var actions = require('lib/actions')
 var features = require('lib/features')
@@ -44,5 +43,4 @@ module.Feature = core.ImageGridFeatures.Feature({
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/features/all.js b/ui (gen4)/features/all.js
index 4f0edbae..619ab5a3 100755
--- a/ui (gen4)/features/all.js	
+++ b/ui (gen4)/features/all.js	
@@ -3,10 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 // import features...
 var core = require('features/core')
@@ -52,5 +51,4 @@ module.ImageGridFeatures =
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/features/app.js b/ui (gen4)/features/app.js
index 8515d9ac..636ccbd8 100755
--- a/ui (gen4)/features/app.js	
+++ b/ui (gen4)/features/app.js	
@@ -3,10 +3,10 @@
 *
 *
 **********************************************************************/
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
 if(typeof(process) != 'undefined'){
 	var pathlib = requirejs('path')
 }
@@ -307,5 +307,4 @@ module.FullScreenControlls = core.ImageGridFeatures.Feature({
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/features/base.js b/ui (gen4)/features/base.js
index a462da94..efaf2d31 100755
--- a/ui (gen4)/features/base.js	
+++ b/ui (gen4)/features/base.js	
@@ -4,10 +4,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 var actions = require('lib/actions')
 var features = require('lib/features')
@@ -1266,5 +1265,4 @@ module.Journal = core.ImageGridFeatures.Feature({
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/features/cli.js b/ui (gen4)/features/cli.js
index 46534b0f..2053bca6 100755
--- a/ui (gen4)/features/cli.js	
+++ b/ui (gen4)/features/cli.js	
@@ -3,10 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 var util = require('lib/util')
 var actions = require('lib/actions')
diff --git a/ui (gen4)/features/core.js b/ui (gen4)/features/core.js
index c3b99615..4439cb0c 100755
--- a/ui (gen4)/features/core.js	
+++ b/ui (gen4)/features/core.js	
@@ -5,8 +5,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 // XXX
 var DEBUG = typeof(DEBUG) != 'undefined' ? DEBUG : true
@@ -527,5 +528,4 @@ module.Tasks = ImageGridFeatures.Feature({
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/features/demo.js b/ui (gen4)/features/demo.js
index bb72b4f7..bdb4237d 100755
--- a/ui (gen4)/features/demo.js	
+++ b/ui (gen4)/features/demo.js	
@@ -3,10 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 var actions = require('lib/actions')
 var features = require('lib/features')
@@ -82,5 +81,4 @@ module.Demo = core.ImageGridFeatures.Feature({
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/features/experimental.js b/ui (gen4)/features/experimental.js
index 8035161b..c86c41bf 100755
--- a/ui (gen4)/features/experimental.js	
+++ b/ui (gen4)/features/experimental.js	
@@ -3,10 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 var actions = require('lib/actions')
 var features = require('lib/features')
@@ -52,5 +51,4 @@ module.ExperimentFeature = core.ImageGridFeatures.Feature({
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/features/external-editor.js b/ui (gen4)/features/external-editor.js
index 8589896e..03a8d7df 100755
--- a/ui (gen4)/features/external-editor.js	
+++ b/ui (gen4)/features/external-editor.js	
@@ -3,10 +3,10 @@
 *
 *
 **********************************************************************/
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
 if(typeof(process) != 'undefined'){
 	var pathlib = requirejs('path')
 }
@@ -426,5 +426,4 @@ module.ExternalEditorUI = core.ImageGridFeatures.Feature({
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/features/filesystem.js b/ui (gen4)/features/filesystem.js
index 3ebfdfa6..21db5d56 100755
--- a/ui (gen4)/features/filesystem.js	
+++ b/ui (gen4)/features/filesystem.js	
@@ -3,10 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 // XXX this should not be imported!!!
 // 		...something wrong with requirejs(..)
@@ -2447,5 +2446,4 @@ core.ImageGridFeatures.Feature('fs', [
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/features/history.js b/ui (gen4)/features/history.js
index 1c9e0596..b540a359 100755
--- a/ui (gen4)/features/history.js	
+++ b/ui (gen4)/features/history.js	
@@ -3,10 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 var actions = require('lib/actions')
 var features = require('lib/features')
@@ -515,5 +514,4 @@ module.URLHistoryUI = core.ImageGridFeatures.Feature({
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/features/keyboard.js b/ui (gen4)/features/keyboard.js
index 54fe3174..f4d66607 100755
--- a/ui (gen4)/features/keyboard.js	
+++ b/ui (gen4)/features/keyboard.js	
@@ -3,10 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 var actions = require('lib/actions')
 var features = require('lib/features')
@@ -467,5 +466,4 @@ module.Keyboard = core.ImageGridFeatures.Feature({
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/features/location.js b/ui (gen4)/features/location.js
index b124fc48..9cc7ce06 100755
--- a/ui (gen4)/features/location.js	
+++ b/ui (gen4)/features/location.js	
@@ -3,10 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 var util = require('lib/util')
 var object = require('lib/object')
@@ -231,5 +230,4 @@ module.Location = core.ImageGridFeatures.Feature({
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/features/meta.js b/ui (gen4)/features/meta.js
index 8d143280..0c936dfe 100755
--- a/ui (gen4)/features/meta.js	
+++ b/ui (gen4)/features/meta.js	
@@ -3,10 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 var actions = require('lib/actions')
 var features = require('lib/features')
@@ -145,5 +144,4 @@ core.ImageGridFeatures.Feature('viewer-minimal', [
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/features/metadata.js b/ui (gen4)/features/metadata.js
index 646140e3..048c6c5c 100755
--- a/ui (gen4)/features/metadata.js	
+++ b/ui (gen4)/features/metadata.js	
@@ -13,9 +13,9 @@ if(typeof(process) != 'undefined'){
 }
 
 
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 var util = require('lib/util')
 var toggler = require('lib/toggler')
@@ -587,5 +587,4 @@ module.MetadataFSUI = core.ImageGridFeatures.Feature({
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/features/recover.js b/ui (gen4)/features/recover.js
index d5794859..b8d6ec7b 100755
--- a/ui (gen4)/features/recover.js	
+++ b/ui (gen4)/features/recover.js	
@@ -3,8 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 var actions = require('lib/actions')
 var features = require('lib/features')
@@ -125,5 +126,4 @@ module.Recovery = core.ImageGridFeatures.Feature({
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/features/sharp.js b/ui (gen4)/features/sharp.js
index 03ae6d5e..be9c6de2 100755
--- a/ui (gen4)/features/sharp.js	
+++ b/ui (gen4)/features/sharp.js	
@@ -3,10 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 var actions = require('lib/actions')
 var features = require('lib/features')
@@ -332,5 +331,4 @@ module.Sharp = core.ImageGridFeatures.Feature({
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/features/sort.js b/ui (gen4)/features/sort.js
index 34045edc..83b21f8a 100755
--- a/ui (gen4)/features/sort.js	
+++ b/ui (gen4)/features/sort.js	
@@ -3,10 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 var actions = require('lib/actions')
 var features = require('lib/features')
@@ -484,5 +483,4 @@ module.SortUI = core.ImageGridFeatures.Feature({
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/features/tags.js b/ui (gen4)/features/tags.js
index e9fc7c68..8b5e0e02 100755
--- a/ui (gen4)/features/tags.js	
+++ b/ui (gen4)/features/tags.js	
@@ -3,10 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 var actions = require('lib/actions')
 var features = require('lib/features')
@@ -77,5 +76,4 @@ module.TagUI = core.ImageGridFeatures.Feature({
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/features/ui-chrome.js b/ui (gen4)/features/ui-chrome.js
index 675d7eec..1ddd6276 100755
--- a/ui (gen4)/features/ui-chrome.js	
+++ b/ui (gen4)/features/ui-chrome.js	
@@ -3,10 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 var actions = require('lib/actions')
 var features = require('lib/features')
@@ -675,5 +674,4 @@ module.UIScale = core.ImageGridFeatures.Feature({
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/features/ui-marks.js b/ui (gen4)/features/ui-marks.js
index 17fbd8c1..8142767f 100755
--- a/ui (gen4)/features/ui-marks.js	
+++ b/ui (gen4)/features/ui-marks.js	
@@ -3,10 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 var toggler = require('lib/toggler')
 var actions = require('lib/actions')
@@ -303,5 +302,4 @@ core.ImageGridFeatures.Feature('marks', [
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/features/ui-partial-ribbons.js b/ui (gen4)/features/ui-partial-ribbons.js
index cee19396..55575b0f 100755
--- a/ui (gen4)/features/ui-partial-ribbons.js	
+++ b/ui (gen4)/features/ui-partial-ribbons.js	
@@ -3,10 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 var actions = require('lib/actions')
 var features = require('lib/features')
@@ -419,5 +418,4 @@ module.PartialRibbons = core.ImageGridFeatures.Feature({
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/features/ui-single-image.js b/ui (gen4)/features/ui-single-image.js
index def631bd..98095e37 100755
--- a/ui (gen4)/features/ui-single-image.js	
+++ b/ui (gen4)/features/ui-single-image.js	
@@ -3,10 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 var actions = require('lib/actions')
 var features = require('lib/features')
@@ -543,5 +542,4 @@ module.SingleImageAutoHideCursor = core.ImageGridFeatures.Feature({
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/features/ui-slideshow.js b/ui (gen4)/features/ui-slideshow.js
index a62f7a6f..5a0b3d14 100755
--- a/ui (gen4)/features/ui-slideshow.js	
+++ b/ui (gen4)/features/ui-slideshow.js	
@@ -3,10 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 var toggler = require('lib/toggler')
 var actions = require('lib/actions')
@@ -304,5 +303,4 @@ module.Slideshow = core.ImageGridFeatures.Feature({
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/features/ui-status.js b/ui (gen4)/features/ui-status.js
index d448d587..474cc95d 100755
--- a/ui (gen4)/features/ui-status.js	
+++ b/ui (gen4)/features/ui-status.js	
@@ -3,10 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 var toggler = require('lib/toggler')
 var actions = require('lib/actions')
@@ -657,5 +656,4 @@ module.StatusLog = core.ImageGridFeatures.Feature({
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/features/ui-widgets.js b/ui (gen4)/features/ui-widgets.js
index b9438ad5..9f0398f1 100755
--- a/ui (gen4)/features/ui-widgets.js	
+++ b/ui (gen4)/features/ui-widgets.js	
@@ -3,10 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 var keyboard = require('lib/keyboard')
 var actions = require('lib/actions')
@@ -1323,5 +1322,4 @@ module.WidgetTest = core.ImageGridFeatures.Feature({
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/features/ui.js b/ui (gen4)/features/ui.js
index c15085ad..4e5b87b3 100755
--- a/ui (gen4)/features/ui.js	
+++ b/ui (gen4)/features/ui.js	
@@ -3,10 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 var toggler = require('lib/toggler')
 var actions = require('lib/actions')
@@ -2365,5 +2364,4 @@ module.AutoRibbon = core.ImageGridFeatures.Feature({
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/imagegrid/data.js b/ui (gen4)/imagegrid/data.js
index 28ffed29..7acbd9ef 100755
--- a/ui (gen4)/imagegrid/data.js	
+++ b/ui (gen4)/imagegrid/data.js	
@@ -7,8 +7,9 @@
 * 	utils...
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 
 var sha1 = require('ext-lib/sha1')
@@ -2959,5 +2960,4 @@ module.Data = DataWithTags
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/imagegrid/file.js b/ui (gen4)/imagegrid/file.js
index 18cce9bd..09b2b70e 100755
--- a/ui (gen4)/imagegrid/file.js	
+++ b/ui (gen4)/imagegrid/file.js	
@@ -3,11 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 if(typeof(process) != 'undefined'){
 	var pathlib = requirejs('path')
@@ -982,5 +980,4 @@ function(json, path, date, filename_tpl, logger){
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/imagegrid/formats.js b/ui (gen4)/imagegrid/formats.js
index 90ec175d..fc87f97e 100755
--- a/ui (gen4)/imagegrid/formats.js	
+++ b/ui (gen4)/imagegrid/formats.js	
@@ -3,8 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 
 module.VERSIONS = []
@@ -149,5 +150,4 @@ module.updateData = function(data){
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/imagegrid/images.js b/ui (gen4)/imagegrid/images.js
index 913d2261..b512e710 100755
--- a/ui (gen4)/imagegrid/images.js	
+++ b/ui (gen4)/imagegrid/images.js	
@@ -3,10 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 var sha1 = require('ext-lib/sha1')
 
@@ -710,5 +709,4 @@ object.makeConstructor('Images',
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/imagegrid/ribbons.js b/ui (gen4)/imagegrid/ribbons.js
index 37a1b4ad..d4ed7d40 100755
--- a/ui (gen4)/imagegrid/ribbons.js	
+++ b/ui (gen4)/imagegrid/ribbons.js	
@@ -4,8 +4,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 if(typeof(window) == 'undefined'){
 	return
@@ -2463,5 +2464,4 @@ object.makeConstructor('Ribbons',
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/imagegrid/viewer.js b/ui (gen4)/imagegrid/viewer.js
index e3ab7ce6..d314c230 100755
--- a/ui (gen4)/imagegrid/viewer.js	
+++ b/ui (gen4)/imagegrid/viewer.js	
@@ -19,10 +19,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 var features = require('features/all')
 
@@ -37,5 +36,4 @@ module.ImageGridFeatures =
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/lib/_template.js b/ui (gen4)/lib/_template.js
index 41720809..d9897465 100755
--- a/ui (gen4)/lib/_template.js	
+++ b/ui (gen4)/lib/_template.js	
@@ -4,7 +4,7 @@
 *
 **********************************************************************/
 
-//var DEBUG = DEBUG != null ? DEBUG : true
+
 
 
 /*********************************************************************/
diff --git a/ui (gen4)/lib/actions.js b/ui (gen4)/lib/actions.js
index 20c5a9c1..bed7ed54 100755
--- a/ui (gen4)/lib/actions.js	
+++ b/ui (gen4)/lib/actions.js	
@@ -3,10 +3,9 @@
 *
 *
 **********************************************************************/
-
-//var DEBUG = DEBUG != null ? DEBUG : true
-
-define(function(require){ var module = {}
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 var args2array = require('lib/util').args2array
 var toggler = require('lib/toggler')
diff --git a/ui (gen4)/lib/features.js b/ui (gen4)/lib/features.js
index 143c468b..bd4b46ca 100755
--- a/ui (gen4)/lib/features.js	
+++ b/ui (gen4)/lib/features.js	
@@ -3,10 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 var args2array = require('lib/util').args2array
 
@@ -696,5 +695,4 @@ module.Features = new FeatureSet()
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/lib/keyboard.js b/ui (gen4)/lib/keyboard.js
index 600ec9ab..5fea435c 100755
--- a/ui (gen4)/lib/keyboard.js	
+++ b/ui (gen4)/lib/keyboard.js	
@@ -3,10 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 
 
@@ -1035,5 +1034,4 @@ function updateHTMLKeyDoc(help, root){
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/lib/object.js b/ui (gen4)/lib/object.js
index a812108f..a1bbfcfe 100755
--- a/ui (gen4)/lib/object.js	
+++ b/ui (gen4)/lib/object.js	
@@ -3,10 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 
 
@@ -213,5 +212,4 @@ function superMethod(cls, meth){
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/lib/preview.js b/ui (gen4)/lib/preview.js
index 97b9107d..dd1ecd84 100755
--- a/ui (gen4)/lib/preview.js	
+++ b/ui (gen4)/lib/preview.js	
@@ -3,8 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 try{
 	var sharp = requirejs('sharp')
@@ -124,5 +125,4 @@ function(images, sizes, base_path, target_tpl, callback){
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/lib/tasks.js b/ui (gen4)/lib/tasks.js
index 5c73c673..acb77f80 100755
--- a/ui (gen4)/lib/tasks.js	
+++ b/ui (gen4)/lib/tasks.js	
@@ -3,10 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 var actions = require('lib/actions')
 var object = require('lib/object')
@@ -378,5 +377,4 @@ object.makeConstructor('Queue', QueueActions)
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/lib/toggler.js b/ui (gen4)/lib/toggler.js
index 7cad5b92..6f0a120e 100755
--- a/ui (gen4)/lib/toggler.js	
+++ b/ui (gen4)/lib/toggler.js	
@@ -3,8 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 
 
@@ -408,5 +409,4 @@ CSSClassToggler.prototype.__proto__ = Toggler.prototype
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/lib/transform.js b/ui (gen4)/lib/transform.js
index 2af86d0d..e7339547 100755
--- a/ui (gen4)/lib/transform.js	
+++ b/ui (gen4)/lib/transform.js	
@@ -3,8 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 if(typeof(window) == 'undefined'){
 	return
@@ -556,5 +557,4 @@ jQuery.fn.origin = function(a, b, c){
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/lib/util.js b/ui (gen4)/lib/util.js
index 09e703e0..7a256446 100755
--- a/ui (gen4)/lib/util.js	
+++ b/ui (gen4)/lib/util.js	
@@ -3,10 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 
 
@@ -506,5 +505,4 @@ if(typeof(jQuery) != typeof(undefined)){
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/lib/widget/browse-walk.js b/ui (gen4)/lib/widget/browse-walk.js
index 0cff9920..dab60b4f 100755
--- a/ui (gen4)/lib/widget/browse-walk.js	
+++ b/ui (gen4)/lib/widget/browse-walk.js	
@@ -3,8 +3,9 @@
 *
 *
 **********************************************************************/
-
-define(function(require){ var module = {}
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 if(typeof(process) != 'undefined'){
 	var os = requirejs('os')
@@ -350,5 +351,4 @@ module.makeGlobList = function(elem, pattern, prepare){
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/lib/widget/browse.js b/ui (gen4)/lib/widget/browse.js
index d5bd3a5b..b1fafa00 100755
--- a/ui (gen4)/lib/widget/browse.js	
+++ b/ui (gen4)/lib/widget/browse.js	
@@ -3,21 +3,9 @@
 *
 *
 **********************************************************************/
-
-//var DEBUG = DEBUG != null ? DEBUG : true
-
-/* XXX get rid of this ASAP...
-if(typeof(module) !== 'undefined' && module.exports){
-	var NW = true
-	var gui = require('nw.gui')
-
-} else {
-	var NW = false
-}
-*/
-
-
-define(function(require){ var module = {}
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 
 //var promise = require('promise')
@@ -2690,5 +2678,4 @@ module.makePathList = makeBrowserMaker(PathList)
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                                                */
-return module })
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/ui (gen4)/ui.js b/ui (gen4)/ui.js
index 3c623146..79114c11 100755
--- a/ui (gen4)/ui.js	
+++ b/ui (gen4)/ui.js	
@@ -39,11 +39,9 @@ if(typeof(process) != 'undefined'){
 
 
 /*********************************************************************/
-
-define(function(require){ var module = {}
-//requirejs(['viewer'], function(viewer){
-
-//var DEBUG = DEBUG != null ? DEBUG : true
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
 
 var viewer = require('imagegrid/viewer')