[*] BO : Nav + Theme fixs