diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 9aaf5c0..09d3476 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -766,33 +766,70 @@ client.connect_signal("request::titlebars", function(c)
             c:emit_signal("request::activate", "titlebar", {raise = true})
             awful.mouse.client.resize(c)
         end)
-    )
+				)
 
-    awful.titlebar(c, { size = 50 }) : setup {
-        { -- Left
-            awful.titlebar.widget.iconwidget(c),
-            buttons = buttons,
-            layout  = wibox.layout.fixed.horizontal
-        },
-        { -- Middle
-            { -- Title
-                align  = "center",
-                widget = awful.titlebar.widget.titlewidget(c)
-            },
-            buttons = buttons,
-            layout  = wibox.layout.flex.horizontal
-        },
-        { -- Right
-            awful.titlebar.widget.floatingbutton (c),
-            awful.titlebar.widget.maximizedbutton(c),
-            awful.titlebar.widget.stickybutton   (c),
-            awful.titlebar.widget.ontopbutton    (c),
-            awful.titlebar.widget.closebutton    (c),
-            layout = wibox.layout.fixed.horizontal()
-        },
-        layout = wibox.layout.align.horizontal
-    }
-end)
+				-- New Titlebar Code
+
+				-- Add a titlebar if titlebars_enabled is set to true in the rules.
+				client.connect_signal("request::titlebars", function(c)
+					-- Custom
+					if beautiful.titlebar_fun then
+						beautiful.titlebar_fun(c)
+						return
+					end
+
+					-- Function to get titlebar size based on hostname
+					local function get_titlebar_size()
+						local hostname = io.popen("hostname"):read("*l")
+						if hostname == "mairon" then
+							return 50
+						elseif hostname == "orthanc" then
+							return 20
+						else
+							return 20  -- default size
+						end
+					end
+
+					-- Default
+					-- buttons for the titlebar
+					local buttons = mytable.join(
+					awful.button({ }, 1, function()
+						c:emit_signal("request::activate", "titlebar", {raise = true})
+						awful.mouse.client.move(c)
+					end),
+					awful.button({ }, 3, function()
+						c:emit_signal("request::activate", "titlebar", {raise = true})
+						awful.mouse.client.resize(c)
+					end)
+					)
+
+					awful.titlebar(c, { size = get_titlebar_size() }) : setup {
+						{ -- Left
+							awful.titlebar.widget.iconwidget(c),
+							buttons = buttons,
+							layout  = wibox.layout.fixed.horizontal
+						},
+						{ -- Middle
+							{ -- Title
+								align  = "center",
+								widget = awful.titlebar.widget.titlewidget(c)
+							},
+							buttons = buttons,
+							layout  = wibox.layout.flex.horizontal
+						},
+						{ -- Right
+							awful.titlebar.widget.floatingbutton (c),
+							awful.titlebar.widget.maximizedbutton(c),
+							awful.titlebar.widget.stickybutton   (c),
+							awful.titlebar.widget.ontopbutton    (c),
+							awful.titlebar.widget.closebutton    (c),
+							layout = wibox.layout.fixed.horizontal()
+						},
+						layout = wibox.layout.align.horizontal
+					}
+				end)
+
+			end)
 
 -- Enable sloppy focus, so that focus follows mouse.
 client.connect_signal("mouse::enter", function(c)