Move themes back to toplevel.
Add rnu for vim.