New theme, some fixes