Added old-one-piece theme
Some changes