Fixes here and there
Improve tinc templates
Bits
Bits on menu.py
Merge branch 'redribbon'