-- Added new templates

 -- Detection better but need to rethink shapes so that more features are found like in case of checkbox