Script rework
Added CSS class for theming