WIP refresh vimate
Fine tuning