Add ticks since sunrise back in

Also tabs to spaces because, srsly?