diff --git a/acl/edit_user.cgi b/acl/edit_user.cgi
index c64f90cdb..4c87f260c 100755
--- a/acl/edit_user.cgi
+++ b/acl/edit_user.cgi
@@ -211,7 +211,7 @@ if ($access{'cats'}) {
 			    [ 0, $text{'default'} ] ]));
 	}
 
-my @all = &webmin::list_themes();
+my @all = &webmin::list_visible_themes();
 my @themes = grep { !$_->{'overlay'} } @all;
 my @overlays = grep { $_->{'overlay'} } @all;
 
diff --git a/usermin/edit_themes.cgi b/usermin/edit_themes.cgi
index ef6695010..f620e7c26 100755
--- a/usermin/edit_themes.cgi
+++ b/usermin/edit_themes.cgi
@@ -7,7 +7,7 @@ $access{'themes'} || &error($text{'acl_ecannot'});
 &ReadParse();
 &ui_print_header(undef, $text{'themes_title'}, "");
 
-@themes = &list_themes();
+@themes = &list_visible_themes();
 &get_usermin_config(\%uconfig);
 $prog = "edit_themes.cgi?mode=";
 
diff --git a/usermin/usermin-lib.pl b/usermin/usermin-lib.pl
index acde87b63..32c665abe 100755
--- a/usermin/usermin-lib.pl
+++ b/usermin/usermin-lib.pl
@@ -181,7 +181,6 @@ my %done;
 foreach my $theme (&list_themes()) {
         my $iscurr = $curr && $theme->{'dir'} eq $curr;
         next if (-l $root_directory."/".$theme->{'dir'} &&
-                 $theme->{'dir'} =~ /\d+$/ &&
                  !$iscurr);
         next if ($done{$theme->{'desc'}}++ && !$iscurr);
         push(@rv, $theme);
diff --git a/webmin/webmin-lib.pl b/webmin/webmin-lib.pl
index 1cc742586..d11755551 100755
--- a/webmin/webmin-lib.pl
+++ b/webmin/webmin-lib.pl
@@ -2752,7 +2752,6 @@ my %done;
 foreach my $theme (&list_themes()) {
 	my $iscurr = $curr && $theme->{'dir'} eq $curr;
 	next if (-l $root_directory."/".$theme->{'dir'} &&
-		 $theme->{'dir'} =~ /\d+$/ &&
 		 !$iscurr);
 	next if ($done{$theme->{'desc'}}++ && !$iscurr);
 	push(@rv, $theme);