Further Improvements to Menu Handling, Themed Rectangles