Migrate insert/normal environment settings from default theme + misc formatting