update thmes
Fix offset timing + nullable on push still buggy