restructure theme and add single map support (still buggy for mapgroup