* Variables cleanup + add manual installation mode for legacy use