Fixed theme and bugs found by Pat