shortened x jittering & y limiting

plus some theme optimisation, code clean-up & commenting