diff --git a/themes/awb/awb.lua b/themes/awb/awb.lua
index 645b8e6b4..caa62b299 100644
--- a/themes/awb/awb.lua
+++ b/themes/awb/awb.lua
@@ -286,15 +286,6 @@ function spawn_vidwin(self)
 		return;
 	end
 
-	local res = awbwman_inputattach(function(msg) end, 
-		inputlbl, {
-		w = 64,
-		h = 32,
-		owner = wnd.canvas.vid
-	});
-
--- tests, border, noborder, static vs. dynamic
-	wnd.input = function(self, tbl) res:input(tbl); end
 end
 
 function gamelist_media(tbl)
diff --git a/themes/awb/awbwman.lua b/themes/awb/awbwman.lua
index b92df3954..4392c62b3 100644
--- a/themes/awb/awbwman.lua
+++ b/themes/awb/awbwman.lua
@@ -169,6 +169,12 @@ end
 
 function awbwman_fullscreen(wnd)
 	awbwman_focus(wnd);
+	if (awb_cfg.shadowimg ~= nil) then
+		expire_image(awb_cfg.shadowimg, awb_cfg.animspeed);
+		blend_image(awb_cfg.shadowimg, 0.0, awb_cfg.animspeed);
+		awb_cfg.shadowimg = nil;
+	end
+
 	blend_image(mouse_cursor(), 0.0, awb_cfg.animspeed);
 
 -- hide root window (will cascade and hide everything else)
@@ -259,7 +265,8 @@ function awbwman_shadow_nonfocus()
 		blend_image(awb_cfg.shadowimg, 0.5, awb_cfg.animspeed);
 	else
 		expire_image(awb_cfg.shadowimg, awb_cfg.animspeed);
-		blend_image(awb_cfg.shadowimg, 0.0, awb_cfg.animspeed); 
+		blend_image(awb_cfg.shadowimg, 0.0, awb_cfg.animspeed);
+		awb_cfg.shadowimg = nil;
 	end
 end
 
@@ -468,6 +475,10 @@ function awbwman_gather_scatter()
 		for ind, val in ipairs(awb_wtable) do
 			if (not val.minimized) then
 				val.pos_memory = {val.x, val.y};
+				if (val.w == nil) then
+					val.w = 64;
+					val.h = 32;
+				end
 
 				if ( ( val.x + val.w * 0.5) < 0.5 * VRESW) then
 					move_image(val.anchor,  -val.w, val.y, awb_cfg.animspeed);
@@ -897,12 +908,15 @@ function awbwman_rootwnd()
 			local g = awb_col.bgcolor.g;
 			local b = awb_col.bgcolor.b;
 			local canvas = fill_surface(wcont.w, wcont.h, r, g, b);
-			wcont:update_canvas(canvas);
+			image_sharestorage(canvas, wcont.canvas.vid);
+			delete_image(canvas);
 		end,
 		function()
 			show_help(); 
 		end,
-		shutdown
+		function()
+			awbwman_shutdown();
+		end
 	};
 
 	local icn = tbar:add_icon("cap", "l", cap, function(self) 
diff --git a/themes/awb/awbwnd_media.lua b/themes/awb/awbwnd_media.lua
index e5cb8e837..2fd5505ff 100644
--- a/themes/awb/awbwnd_media.lua
+++ b/themes/awb/awbwnd_media.lua
@@ -482,6 +482,7 @@ local function vcap_setup(pwin)
 					else
 						running = true;
 						pwin:update_canvas(source);
+						pwin:resize(status.width, status.height, true, true);
 					end
 				end
 			end);
diff --git a/themes/awb/shortcuts/.gitignore b/themes/awb/shortcuts/.gitignore
new file mode 100644
index 000000000..e69de29bb