Re-write to use with unibasetheme 2.x