Added straight and corner baffles
Added rounded rectangles and cubes