Fix ~ not expanding
Add Markaby template