Commit with current version of original authors code

Previous commit used older version. This version includes updated
elements in original authors code + my theming.