diff --git a/bindings.lua b/bindings.lua
index 7dc3537..76adeab 100644
--- a/bindings.lua
+++ b/bindings.lua
@@ -72,6 +72,16 @@ globalkeys = awful.util.table.join(
 	awful.key({ hyper }, "3", function () awful.util.spawn("/usr/local/bin/tabletstick 3") end),
 	awful.key({ hyper }, "4", function () awful.util.spawn("/usr/local/bin/tabletstick 4") end),
 	awful.key({ hyper }, "5", function () awful.util.spawn("/usr/local/bin/tabletstick 4") end),
+
+	--}}}
+	
+	--{{{ thinkpad
+
+    awful.key({ }, "XF86Sleep",  function () awful.util.spawn("/usr/local/bin/s2ram")end ),
+    awful.key({ }, "XF86Away",  function () awful.util.spawn("xlock")end ),
+    awful.key({ }, "XF86TouchpadToggle",  function () awful.util.spawn("touchpad")end ),
+
+	--}}}
     
     --{{{ Audio control
     awful.key({ }, "Print",  function () teardrop("urxvtc -e alsamixer","top","center", 0.99, 0.4)end ),
@@ -110,17 +120,6 @@ globalkeys = awful.util.table.join(
 
     --}}}
 
-    --{{{ g15Keys
-
-    awful.key({ }, "XF86Word",   awful.tag.viewprev       ),
-    awful.key({ }, "XF86WebCam",  awful.tag.viewnext       ),
-    awful.key({ }, "XF86Away", awful.tag.history.restore),
-
-    awful.key({ }, "XF86iTouch", function () awful.screen.focus_relative( 1) end),
-    awful.key({ }, "XF86Support", function () awful.screen.focus_relative(-1) end),
-
-    --}}}
-
     --{{{ Default
     awful.key({ modkey,           }, "l",     function () awful.tag.incmwfact( 0.05)    end),
     awful.key({ modkey,           }, "h",     function () awful.tag.incmwfact(-0.05)    end),
diff --git a/rc.lua b/rc.lua
index 885273b..a24fafb 100644
--- a/rc.lua
+++ b/rc.lua
@@ -37,4 +37,4 @@ dofile (MY_PATH .. "wibox.lua")
 dofile (MY_PATH .. "bindings.lua")
 dofile (MY_PATH .. "rules.lua")
 dofile (MY_PATH .. "signals.lua")
-dofile (MY_PATH .. "uzbl.lua")
+-- dofile (MY_PATH .. "uzbl.lua")
diff --git a/rules.lua b/rules.lua
index 9d67c01..c5b4827 100644
--- a/rules.lua
+++ b/rules.lua
@@ -7,6 +7,8 @@ awful.rules.rules = {
                      focus = true,
                      size_hints_honor = false,
                      keys = clientkeys,
+		     minimized = false,
+		     --skip_taskbar = true,
                      buttons = clientbuttons } },
     { rule = { class = "MPlayer" },
       properties = { floating = true,
@@ -23,8 +25,7 @@ awful.rules.rules = {
   					skip_taskbar = false } },
     { rule = { class = "Firefox", instance = "Navigator" },
       properties = { tag = tags[rule_screen][2],
-					 skip_taskbar = true,
-                     floating = false } },
+                     floating = false, minimized = false } },
     { rule = { class = "Pidgin" },
       properties = { tag = tags[rule_screen][3]} },
     { rule = { role = "buddy_list" },
diff --git a/wibox.lua b/wibox.lua
index 1fe91dc..42a1ccf 100644
--- a/wibox.lua
+++ b/wibox.lua
@@ -79,7 +79,7 @@ vicious.register(mailwidget, vicious.widgets.mdir,
 --}}}
 
 -- battery {{{
-if exists("/proc/acpi/battery/BAT0") then
+if exists("/sys/class/power_supply/BAT0") then
     batwidget0 = widget({ type = "textbox" })
     vicious.register(batwidget0, vicious.widgets.bat,
 	function (widget, args)
@@ -97,7 +97,7 @@ if exists("/proc/acpi/battery/BAT0") then
 	end, 61, "BAT0")
 else batwidget0 = nullwidget end
 
-if exists("/proc/acpi/battery/BAT1") then
+if exists("/sys/class/power_supply/BAT1") then
     batwidget1 = widget({ type = "textbox" })
     vicious.register(batwidget1, vicious.widgets.bat,
 	function (widget, args)
@@ -115,7 +115,7 @@ if exists("/proc/acpi/battery/BAT1") then
 	end, 61, "BAT1")
 else batwidget1 = nullwidget end
 
-if exists("/proc/acpi/battery/BAT2") then
+if exists("/sys/class/power_supply/BAT2") then
     batwidget2 = widget({ type = "textbox" })
     vicious.register(batwidget2, vicious.widgets.bat,
 	function (widget, args)