Build theme bugs fixes