Push dev to master

fix theme bugs and remove old files, update jquery after theme update