Signed-off-by: Simon Rozman <simon@rozman.si>
And other unifications with installer before merging. Signed-off-by: Simon Rozman <simon@rozman.si>