Improved: Child theme compability & small fixes