Update templates & cleanup code.
Update sender.java & set available for subscriptions by default