add new themes
go sublime
resolve conflicts