Fix ridiculously long line of code

Signed-off-by: Suki <suki@missallsunday.com>
Group em all

Signed-off-by: Suki <suki@missallsunday.com>
Don't forget to use global vars

Signed-off-by: Suki <suki@missallsunday.com>
Should have moved these too.

Signed-off-by: Suki <suki@missallsunday.com>
theme_install only needs to return the newly created ID

Signed-off-by: Suki <suki@missallsunday.com>