Continue cleaning up old skin code for Bootstrap