Change theme, add vi-mode