Updated themes and added extension support