add square
fix square rainbow