diff --git a/src/perl/ui/Themes.xs b/src/perl/ui/Themes.xs
index f22d6859..aa05354c 100644
--- a/src/perl/ui/Themes.xs
+++ b/src/perl/ui/Themes.xs
@@ -54,6 +54,13 @@ void perl_themes_deinit(void)
 MODULE = Irssi::UI::Themes  PACKAGE = Irssi
 PROTOTYPES: ENABLE
 
+Irssi::UI::Theme
+current_theme()
+CODE:
+	RETVAL = current_theme;
+OUTPUT:
+	RETVAL
+
 void
 theme_register(formats)
 	SV *formats
@@ -175,3 +182,11 @@ CODE:
 
         printformat_perl(&dest, format, arglist);
 
+#*******************************
+MODULE = Irssi::UI::Themes  PACKAGE = Irssi::UI::Theme  PREFIX = theme_
+#*******************************
+
+char *
+theme_format_expand(theme, format)
+	Irssi::UI::Theme theme
+	char *format
diff --git a/src/perl/ui/UI.xs b/src/perl/ui/UI.xs
index 963f6bbb..0f7a39ac 100644
--- a/src/perl/ui/UI.xs
+++ b/src/perl/ui/UI.xs
@@ -41,6 +41,7 @@ static void perl_window_fill_hash(HV *hv, WINDOW_REC *window)
 	hv_store(hv, "last_timestamp", 14, newSViv(window->last_timestamp), 0);
 	hv_store(hv, "last_line", 9, newSViv(window->last_line), 0);
 
+	hv_store(hv, "theme", 5, plain_bless(window->theme, "Irssi::UI::Theme"), 0);
 	hv_store(hv, "theme_name", 10, new_pv(window->theme_name), 0);
 }