new solid borders, put wrapper back