Render border solid-style properly
Update Submodule
Add diamond test code