Updated Project and window template