some fixes, now using a normal theme