Fix folding and colors and such