Major refactor : Theme, options, etc...