Added 12/24 support based on watch setting