Commodore theme fix