Add some clock customization

EDIT:
 Please delete this pull request, i forgot to sync last changes :P