Some changes when I switched back to Ubuntu
Cleaning some org-config and keeping only what is needed for now