Added Comments, New Styles

More _S and Toolbox theme referencing

Signed-off-by: Matthew Ell <ell.matthew@gmail.com>