diff --git a/_config.yml b/_config.yml
index 96ca32b26..12e5c6b9d 100644
--- a/_config.yml
+++ b/_config.yml
@@ -34,7 +34,7 @@ gems:
 
 pcjs:
   domain: pcjs.org    # whereas site.url is used for linking purposes, site.pcjs.domain is used for display purposes
-  version: 1.30.6     # IMPORTANT: keep pcjs.version in sync with package.json:version
+  version: 1.31.0     # IMPORTANT: keep pcjs.version in sync with package.json:version
   compiled: true      # by default, the compiled pcjs.version scripts will be used (eg, pcx86.js or pcx86-dbg.js)
   c1p_scripts:        # if pcjs.compiled is false, the following scripts will be included instead, in the order listed
     - /modules/shared/lib/defines.js
@@ -134,16 +134,16 @@ pcjs:
     - /modules/shared/lib/state.js
     - /modules/shared/lib/embed.js
   pdp11_scripts:
-    - /modules/shared/lib/defines.js
-    - /modules/shared/lib/nodebug.js
-    - /modules/shared/lib/dumpapi.js
-    - /modules/shared/lib/reportapi.js
-    - /modules/shared/lib/userapi.js
-    - /modules/shared/lib/keys.js
-    - /modules/shared/lib/strlib.js
-    - /modules/shared/lib/usrlib.js
-    - /modules/shared/lib/weblib.js
-    - /modules/shared/lib/component.js
+    - /modules/shared/es6/defines.js
+    - /modules/shared/es6/nodebug.js
+    - /modules/shared/es6/dumpapi.js
+    - /modules/shared/es6/reportapi.js
+    - /modules/shared/es6/userapi.js
+    - /modules/shared/es6/keys.js
+    - /modules/shared/es6/strlib.js
+    - /modules/shared/es6/usrlib.js
+    - /modules/shared/es6/weblib.js
+    - /modules/shared/es6/component.js
     - /modules/pdp11/lib/defines.js
     - /modules/pdp11/lib/messages.js
     - /modules/pdp11/lib/panel.js
@@ -161,8 +161,8 @@ pcjs:
     - /modules/pdp11/lib/disk.js
     - /modules/pdp11/lib/rk11.js
     - /modules/pdp11/lib/rl11.js
-    - /modules/shared/lib/debugger.js
+    - /modules/shared/es6/debugger.js
     - /modules/pdp11/lib/debugger.js
     - /modules/pdp11/lib/computer.js
-    - /modules/shared/lib/state.js
-    - /modules/shared/lib/embed.js
+    - /modules/shared/es6/state.js
+    - /modules/shared/es6/embed.js
diff --git a/docs/pcx86/examples/pcx86-dbg.js b/docs/pcx86/examples/pcx86-dbg.js
index b6fdcab10..211893060 100644
--- a/docs/pcx86/examples/pcx86-dbg.js
+++ b/docs/pcx86/examples/pcx86-dbg.js
@@ -869,4 +869,4 @@ a):f("transformToFragment failed")):f("unable to transform XML: unsupported brow
 function zs(a,b,c,d){if(!c&&b){d.push(b);a=lb[d[0]];b=null;for(var e in a)if(ma(e,"components.xsl")){b=e.replace(".xsl",".css");break}b?Aa(b,null,!0,function(a,b){As(b,d)}):As(null,d)}else w("Error ("+c+") requesting "+a)}
 function As(a,b){var c,d,e,f=b[0],g=b[1];c=b[4];c=c.match(/^(\s*\(function\(\)\{)([\s\S]*)(}\)\(\);\s*)$/);var h=lb[f],k={},m;for(m in h){var n=h[m],t=ka(m);if("xml"==t){for(t=/[ \t]*<disk [^>]*path=(['"])(.*?)\1.*?<\/disk>\n?/g;d=t.exec(h[m]);){var q=d[2];q&&(h[q]||(n=n.replace(d[0],"")))}d=m=ja(m)}else"xsl"==t&&(e=m=ja(m));k[m]=n}a&&(k[m="css"]=a);b[2]&&(k[m="parms"]=b[2]);b[3]&&(k[m="state"]=b[3]);d&&e?(a=JSON.stringify(k),g+=".js",c=c[1]+"var resources="+a+";"+c[2]+c[3],c=c.replace(/\u00A9/g,
 "&#xA9;"),a=Na(c,"javascript",!1,g),a=a+(', copy it to your web server as "'+g+'", and then add the following to your web page:\n\n')+('<div id="'+f+'"></div>\n')+"...\n",a=a+('<script type="text/javascript" src="'+g+'">\x3c/script>\n')+('<script type="text/javascript">embedPC("'+f+'","'+d+'","'+e+'");\x3c/script>\n\n')+"The machine should appear where the <div> is located.",w(a)):w("Missing XML/XSL resources")}
-window.savePC=function(a,b,c){var d=pb("Computer",a),e=pb("Debugger",a);if(d){var f=Tr(d,!0),g=d.U?JSON.stringify(d.U):null;b||(b="/versions/pcjs/1.31.0/pc"+(e?"-dbg":"")+".js");if(c&&c({state:f,Ok:g}))return!0;Aa(b,null,!0,function(c,d,e){zs(c,d,e,[a,ja(b,!0),g,f])});return!0}w("Unable to identify machine '"+a+"'");return!1};})();
+window.savePC=function(a,b,c){var d=pb("Computer",a),e=pb("Debugger",a);if(d){var f=Tr(d,!0),g=d.U?JSON.stringify(d.U):null;b||(b="/versions/pcx86/1.31.0/pcx86"+(e?"-dbg":"")+".js");if(c&&c({state:f,Ok:g}))return!0;Aa(b,null,!0,function(c,d,e){zs(c,d,e,[a,ja(b,!0),g,f])});return!0}w("Unable to identify machine '"+a+"'");return!1};})();
diff --git a/docs/pcx86/examples/pcx86.js b/docs/pcx86/examples/pcx86.js
index 3c22d60a9..6ba024290 100644
--- a/docs/pcx86/examples/pcx86.js
+++ b/docs/pcx86/examples/pcx86.js
@@ -687,4 +687,4 @@ a):f("transformToFragment failed")):f("unable to transform XML: unsupported brow
 function Mn(a,b,c,d){if(!c&&b){d.push(b);a=Ua[d[0]];b=null;for(var e in a)if(ia(e,"components.xsl")){b=e.replace(".xsl",".css");break}b?sa(b,null,!0,function(a,b){Nn(b,d)}):Nn(null,d)}else r("Error ("+c+") requesting "+a)}
 function Nn(a,b){var c,d,e,f=b[0],g=b[1];c=b[4];c=c.match(/^(\s*\(function\(\)\{)([\s\S]*)(}\)\(\);\s*)$/);var h=Ua[f],k={},m;for(m in h){var q=h[m],y=ha(m);if("xml"==y){for(y=/[ \t]*<disk [^>]*path=(['"])(.*?)\1.*?<\/disk>\n?/g;d=y.exec(h[m]);){var w=d[2];w&&(h[w]||(q=q.replace(d[0],"")))}d=m=ga(m)}else"xsl"==y&&(e=m=ga(m));k[m]=q}a&&(k[m="css"]=a);b[2]&&(k[m="parms"]=b[2]);b[3]&&(k[m="state"]=b[3]);d&&e?(a=JSON.stringify(k),g+=".js",c=c[1]+"var resources="+a+";"+c[2]+c[3],c=c.replace(/\u00A9/g,
 "&#xA9;"),a=Aa(c,"javascript",!1,g),a=a+(', copy it to your web server as "'+g+'", and then add the following to your web page:\n\n')+('<div id="'+f+'"></div>\n')+"...\n",a=a+('<script type="text/javascript" src="'+g+'">\x3c/script>\n')+('<script type="text/javascript">embedPC("'+f+'","'+d+'","'+e+'");\x3c/script>\n\n')+"The machine should appear where the <div> is located.",r(a)):r("Missing XML/XSL resources")}
-window.savePC=function(a,b,c){var d=Ya("Computer",a),e=Ya("Debugger",a);if(d){var f=Cn(d,!0),g=d.L?JSON.stringify(d.L):null;b||(b="/versions/pcjs/1.31.0/pc"+(e?"-dbg":"")+".js");if(c&&c({state:f,Gj:g}))return!0;sa(b,null,!0,function(c,d,e){Mn(c,d,e,[a,ga(b,!0),g,f])});return!0}r("Unable to identify machine '"+a+"'");return!1};})();
+window.savePC=function(a,b,c){var d=Ya("Computer",a),e=Ya("Debugger",a);if(d){var f=Cn(d,!0),g=d.L?JSON.stringify(d.L):null;b||(b="/versions/pcx86/1.31.0/pcx86"+(e?"-dbg":"")+".js");if(c&&c({state:f,Gj:g}))return!0;sa(b,null,!0,function(c,d,e){Mn(c,d,e,[a,ga(b,!0),g,f])});return!0}r("Unable to identify machine '"+a+"'");return!1};})();
diff --git a/versions/pcx86/1.31.0/pcx86-dbg.js b/versions/pcx86/1.31.0/pcx86-dbg.js
index b6fdcab10..211893060 100644
--- a/versions/pcx86/1.31.0/pcx86-dbg.js
+++ b/versions/pcx86/1.31.0/pcx86-dbg.js
@@ -869,4 +869,4 @@ a):f("transformToFragment failed")):f("unable to transform XML: unsupported brow
 function zs(a,b,c,d){if(!c&&b){d.push(b);a=lb[d[0]];b=null;for(var e in a)if(ma(e,"components.xsl")){b=e.replace(".xsl",".css");break}b?Aa(b,null,!0,function(a,b){As(b,d)}):As(null,d)}else w("Error ("+c+") requesting "+a)}
 function As(a,b){var c,d,e,f=b[0],g=b[1];c=b[4];c=c.match(/^(\s*\(function\(\)\{)([\s\S]*)(}\)\(\);\s*)$/);var h=lb[f],k={},m;for(m in h){var n=h[m],t=ka(m);if("xml"==t){for(t=/[ \t]*<disk [^>]*path=(['"])(.*?)\1.*?<\/disk>\n?/g;d=t.exec(h[m]);){var q=d[2];q&&(h[q]||(n=n.replace(d[0],"")))}d=m=ja(m)}else"xsl"==t&&(e=m=ja(m));k[m]=n}a&&(k[m="css"]=a);b[2]&&(k[m="parms"]=b[2]);b[3]&&(k[m="state"]=b[3]);d&&e?(a=JSON.stringify(k),g+=".js",c=c[1]+"var resources="+a+";"+c[2]+c[3],c=c.replace(/\u00A9/g,
 "&#xA9;"),a=Na(c,"javascript",!1,g),a=a+(', copy it to your web server as "'+g+'", and then add the following to your web page:\n\n')+('<div id="'+f+'"></div>\n')+"...\n",a=a+('<script type="text/javascript" src="'+g+'">\x3c/script>\n')+('<script type="text/javascript">embedPC("'+f+'","'+d+'","'+e+'");\x3c/script>\n\n')+"The machine should appear where the <div> is located.",w(a)):w("Missing XML/XSL resources")}
-window.savePC=function(a,b,c){var d=pb("Computer",a),e=pb("Debugger",a);if(d){var f=Tr(d,!0),g=d.U?JSON.stringify(d.U):null;b||(b="/versions/pcjs/1.31.0/pc"+(e?"-dbg":"")+".js");if(c&&c({state:f,Ok:g}))return!0;Aa(b,null,!0,function(c,d,e){zs(c,d,e,[a,ja(b,!0),g,f])});return!0}w("Unable to identify machine '"+a+"'");return!1};})();
+window.savePC=function(a,b,c){var d=pb("Computer",a),e=pb("Debugger",a);if(d){var f=Tr(d,!0),g=d.U?JSON.stringify(d.U):null;b||(b="/versions/pcx86/1.31.0/pcx86"+(e?"-dbg":"")+".js");if(c&&c({state:f,Ok:g}))return!0;Aa(b,null,!0,function(c,d,e){zs(c,d,e,[a,ja(b,!0),g,f])});return!0}w("Unable to identify machine '"+a+"'");return!1};})();
diff --git a/versions/pcx86/1.31.0/pcx86.js b/versions/pcx86/1.31.0/pcx86.js
index 3c22d60a9..6ba024290 100644
--- a/versions/pcx86/1.31.0/pcx86.js
+++ b/versions/pcx86/1.31.0/pcx86.js
@@ -687,4 +687,4 @@ a):f("transformToFragment failed")):f("unable to transform XML: unsupported brow
 function Mn(a,b,c,d){if(!c&&b){d.push(b);a=Ua[d[0]];b=null;for(var e in a)if(ia(e,"components.xsl")){b=e.replace(".xsl",".css");break}b?sa(b,null,!0,function(a,b){Nn(b,d)}):Nn(null,d)}else r("Error ("+c+") requesting "+a)}
 function Nn(a,b){var c,d,e,f=b[0],g=b[1];c=b[4];c=c.match(/^(\s*\(function\(\)\{)([\s\S]*)(}\)\(\);\s*)$/);var h=Ua[f],k={},m;for(m in h){var q=h[m],y=ha(m);if("xml"==y){for(y=/[ \t]*<disk [^>]*path=(['"])(.*?)\1.*?<\/disk>\n?/g;d=y.exec(h[m]);){var w=d[2];w&&(h[w]||(q=q.replace(d[0],"")))}d=m=ga(m)}else"xsl"==y&&(e=m=ga(m));k[m]=q}a&&(k[m="css"]=a);b[2]&&(k[m="parms"]=b[2]);b[3]&&(k[m="state"]=b[3]);d&&e?(a=JSON.stringify(k),g+=".js",c=c[1]+"var resources="+a+";"+c[2]+c[3],c=c.replace(/\u00A9/g,
 "&#xA9;"),a=Aa(c,"javascript",!1,g),a=a+(', copy it to your web server as "'+g+'", and then add the following to your web page:\n\n')+('<div id="'+f+'"></div>\n')+"...\n",a=a+('<script type="text/javascript" src="'+g+'">\x3c/script>\n')+('<script type="text/javascript">embedPC("'+f+'","'+d+'","'+e+'");\x3c/script>\n\n')+"The machine should appear where the <div> is located.",r(a)):r("Missing XML/XSL resources")}
-window.savePC=function(a,b,c){var d=Ya("Computer",a),e=Ya("Debugger",a);if(d){var f=Cn(d,!0),g=d.L?JSON.stringify(d.L):null;b||(b="/versions/pcjs/1.31.0/pc"+(e?"-dbg":"")+".js");if(c&&c({state:f,Gj:g}))return!0;sa(b,null,!0,function(c,d,e){Mn(c,d,e,[a,ga(b,!0),g,f])});return!0}r("Unable to identify machine '"+a+"'");return!1};})();
+window.savePC=function(a,b,c){var d=Ya("Computer",a),e=Ya("Debugger",a);if(d){var f=Cn(d,!0),g=d.L?JSON.stringify(d.L):null;b||(b="/versions/pcx86/1.31.0/pcx86"+(e?"-dbg":"")+".js");if(c&&c({state:f,Gj:g}))return!0;sa(b,null,!0,function(c,d,e){Mn(c,d,e,[a,ga(b,!0),g,f])});return!0}r("Unable to identify machine '"+a+"'");return!1};})();