Fix Project Setup for everybody! + thx leo

:+1: :+1: :+1: