More fixes :) maybe of Theme Engine or ani other :D