fix format and fix theme