--- deliantra/Deliantra-Client/DC.pm	2008/09/03 06:07:39	1.191
+++ deliantra/Deliantra-Client/DC.pm	2008/09/24 02:39:47	1.194
@@ -12,8 +12,6 @@
 
 =cut
 
-package Deliantra::Client; # work around CPAN breakage
-package App::Deliantra; # try to reserve namespace
 package DC;
 
 use Carp ();
@@ -21,7 +19,7 @@
 our $VERSION;
 
 BEGIN {
-   $VERSION = '0.9975';
+   $VERSION = '0.9976';
 
    use XSLoader;
    XSLoader::load "Deliantra::Client", $VERSION;
@@ -72,7 +70,7 @@
 }
 
 sub socketpipe() {
-   socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
+   socketpair my $fh1, my $fh2, &Socket::AF_UNIX, &Socket::SOCK_STREAM, &Socket::PF_UNSPEC
       or die "cannot establish bidirectional pipe: $!\n";
 
    ($fh1, $fh2)
@@ -148,7 +146,7 @@
 package DC;
 
 our $RC_THEME;
-our $THEME;
+our %THEME;
 our @RC_PATH;
 our $RC_BASE;
 
@@ -168,33 +166,42 @@
    die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n";
 }
 
+sub load_json($) {
+   my ($file) = @_;
+
+   open my $fh, $file
+      or return;
+
+   local $/;
+   JSON::XS->new->utf8->relaxed->decode (<$fh>)
+}
+
 sub set_theme($) {
    return if $RC_THEME eq $_[0];
    $RC_THEME = $_[0];
 
+   # kind of hacky, find the main theme file, then load all theme files and merge them
+
+   %THEME = ();
    @RC_PATH = "theme-$RC_THEME";
 
-   {
-      open my $fh, "<:raw", find_rcfile "theme.json"
-         or die "cannot open theme description file";
+   my $theme = load_json find_rcfile "theme.json"
+      or die "FATAL: theme resource file not found";
 
-      local $/;
-      $THEME = JSON::XS->new->utf8->relaxed->decode (<$fh>);
-   }
+   @RC_PATH = @{ $theme->{path} } if $theme->{path};
+
+   for (@RC_PATH, "") {
+      my $theme = load_json "$RC_BASE/$_/theme.json"
+         or next;
 
-   @RC_PATH = @{ $THEME->{path} } if $THEME->{path};
+      %THEME = ( %$theme, %THEME );
+   }
 }
 
 sub read_cfg {
    my ($file) = @_;
 
-   open my $fh, $file
-      or return;
-
-   local $/;
-   my $CFG = <$fh>;
-
-   $::CFG = decode_json $CFG;
+   $::CFG = load_json $file;
 }
 
 sub write_cfg {