Added Aroma Installer to the build, kanged from flar2 and fix inconsistencies