diff --git a/awesome/rc.lua b/awesome/rc.lua
index d689d2d..7396b02 100644
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -1,11 +1,11 @@
 -- Standard awesome library
-require("awful")
+awful = require("awful")
 require("awful.autofocus")
 require("awful.rules")
 -- Theme handling library
-require("beautiful")
+beautiful = require("beautiful")
 -- Notification library
-require("naughty")
+naughty = require("naughty")
 vicious = require("vicious")
 
 -- {{{ Error handling
@@ -20,7 +20,7 @@ end
 -- Handle runtime errors after startup
 do
     local in_error = false
-    awesome.add_signal("debug::error", function (err)
+    awesome.connect_signal("debug::error", function (err)
         -- Make sure we don't go into an endless error loop
         if in_error then return end
         in_error = true
@@ -463,12 +463,12 @@ awful.rules.rules = {
 
 -- {{{ Signals
 -- Signal function to execute when a new client appears.
-client.add_signal("manage", function (c, startup)
+client.connect_signal("manage", function (c, startup)
     -- Add a titlebar
     -- awful.titlebar.add(c, { modkey = modkey })
 
     -- Enable sloppy focus
-    --c:add_signal("mouse::enter", function(c)
+    --c:connect_signal("mouse::enter", function(c)
     --    if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier
     --        and awful.client.focus.filter(c) then
     --        client.focus = c
@@ -488,8 +488,8 @@ client.add_signal("manage", function (c, startup)
     end
 end)
 
-client.add_signal("focus", function(c) c.border_color = beautiful.border_focus end)
-client.add_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
+client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
+client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
 -- }}}
 
 function run_once(prg,arg_string,pname,screen)