Refatored to remove sublime.pp and some unnecessary packages