highlighting better. line numbers better. Now inspired by original theme