Restructure for fonts/powerline.