Update lo
Update s
Remove dic
Move aliases into common file