I'm not quite sure I understand what you mean. I looked again at the clock (and I noted that there seems to be something wrong with the watch hand anyway ...) and on the clockface it should be properly shown if I understand correctly. The first watch "ends" when the numerical/digital time reaches "01:##:##:##", so anything beyond is part of the second watch.

Concerning the calendar, I was going based on the prior ordering of days/months/season per year, since it is a bit easier to convert to and from (the Coruscant calendar would be trickier, but if the fete days and weeks would be the point where leap days occur, it's not that difficult - the leap days would be at the end of the year which makes all calculations a bit easier). I have a working conversion for the dates themselves for the 12-month-year including leap days based on the rules of the Gregorian calendar for leap years, so I only need to figure out the weekdays (and in that regard, have a "starting" point I can measure my calculations against). Mapping the weekdays 1:1 against our system would be fairly easy - but a five-day-week would be more challenging. The question is, what is more useful, especially if it is supposed to be something that can be used outside of Star Wars.