Here is the full theme (with trial adittions again. I really need to figure this tracker out properly and do my own version) this is still shorter than the first one.