diff --git a/color.ini b/color.ini
index e042212..9d46e5b 100644
--- a/color.ini
+++ b/color.ini
@@ -1,120 +1,101 @@
 [Night]
-; TEXT
-; Main window text color
 text               = a9b1d6
-; Sidebars text color
-; Name of songs
 subtext            = c0caf5
-; Text color of the selected nav at the left container
 nav-active-text    = 2ac3de
 ; FIXME: This has no effect
 ;tab-active-text    = 2ac3de
-
-; CONTAINERS
-
-; Main window background color
 main               = 24283b
-; Left and right sidebar color
 sidebar            = 1f2335
-; Bottom player color
 player             = 1f2335
-; Contextual menu color
 card               = 1f2335
-; Left and right sidebar shadow
-; (Same color as 'sidebar' for no shadow)
 shadow             = 1f2335
-; Albums, songs containers in main container
 main-secondary     = 1f2335
-; Volume slidebar color
-; Heart icon color
-; Playback color
-
-; BUTTONS
-
 button             = 2ac3de
-; Heart icon at playlist or album top
-; Download icon
-; Contextual menu icon
 button-secondary   = a9b1d6
-; Play icon at playlist or album top
 button-active      = 2ac3de
-; Scroll bar
-; Right side of music playback bar
 button-disabled    = a9b1d6
-; Left sidebar selected nav color
 nav-active         = 27384e
-; I don't know what this does
 play-button        = a9b1d6
-; Library top tabs active color
 tab-active         = 27384e
-; Friends activity's active friend mark color
-; Added/Removed to library notification color
 notification       = 414868
-; No idea where this is used
 notification-error = ff0000
-; Playback bar left side
 playback-bar       = 2ac3de
-; No idea
-misc               = FFFFFF
+misc               = 000000
 
 [Storm]
-; TEXT
-; Main window text color
 text               = a9b1d6
-; Sidebars text color
-; Name of songs
 subtext            = c0caf5
-; Text color of the selected nav at the left container
 nav-active-text    = 2ac3de
 ; FIXME: This has no effect
 ;tab-active-text    = 2ac3de
+main               = 24283b
+sidebar            = 1f2335
+player             = 1f2335
+card               = 1f2335
+shadow             = 1f2335
+main-secondary     = 1f2335
+button             = 2ac3de
+button-secondary   = a9b1d6
+button-active      = 2ac3de
+button-disabled    = a9b1d6
+nav-active         = 27384e
+play-button        = a9b1d6
+tab-active         = 27384e
+notification       = 414868
+notification-error = ff0000
+playback-bar       = 2ac3de
+misc               = 000000
+
+[Light]
+text               = a9b1d6
+subtext            = c0caf5
+nav-active-text    = 2ac3de
+; FIXME: This has no effect
+;tab-active-text    = 2ac3de
+main               = 24283b
+sidebar            = 1f2335
+player             = 1f2335
+card               = 1f2335
+shadow             = 1f2335
+main-secondary     = 1f2335
+button             = 2ac3de
+button-secondary   = a9b1d6
+button-active      = 2ac3de
+button-disabled    = a9b1d6
+nav-active         = 27384e
+play-button        = a9b1d6
+tab-active         = 27384e
+notification       = 414868
+notification-error = ff0000
+playback-bar       = 2ac3de
+misc               = FFFFFF
+
+; Description
+
+; TEXT
+
+; text             = main text, playlist names in main field, name of playlist selected in sidebar, headings
+; subtext          = text in main buttons in sidebar, playlist names in sidebar, artist names, and mini infos
+; nav-active-text  = text in main buttons in sidebar when active
 
 ; CONTAINERS
 
-; Main window background color
-main               = 24283b
-; Left and right sidebar color
-sidebar            = 1f2335
-; Bottom player color
-player             = 1f2335
-; Contextual menu color
-card               = 1f2335
-; Left and right sidebar shadow
-; (Same color as 'sidebar' for no shadow)
-shadow             = 1f2335
-; Albums, songs containers in main container
-main-secondary     = 1f2335
-; Volume slidebar color
-; Heart icon color
-; Playback color
+; main             = main bg
+; main-secondary   = bg color of selected song rows, bg color of artist/track cards
+; sidebar          = sidebar bg
+; player           = player bg
+; card             = popup-card bg
+; shadow           = all shadows
 
 ; BUTTONS
 
-button             = 2ac3de
-; Heart icon at playlist or album top
-; Download icon
-; Contextual menu icon
-button-secondary   = a9b1d6
-; Play icon at playlist or album top
-button-active      = 2ac3de
-; Scroll bar
-; Right side of music playback bar
-button-disabled    = a9b1d6
-; Left sidebar selected nav color
-nav-active         = 27384e
-; I don't know what this does
-play-button        = a9b1d6
-; Library top tabs active color
-tab-active         = 27384e
-; Friends activity's active friend mark color
-; Added/Removed to library notification color
-notification       = 414868
-; No idea where this is used
-notification-error = ff0000
-; Playback bar left side
-playback-bar       = 2ac3de
-; No idea
-misc               = FFFFFF
-
-[Light]
-; TODO
+; button           = playlist buttons bg in sidebar, drop-down menus, now playing song, like button
+; button-secondary = download and options button
+; button-active    = hover on song selected
+; button-disabled  = seekbar bg, volume bar bg, scrollbar
+; nav-active       = sidebar buttons bg
+; play-button      = color of main play button in main field
+; tab-active       = button bg in main field (playlists, podcasts, artists, albums)
+; notification     = notification ('Added to liked songs' etc.)
+; playback-bar     = seekbar fg, volume bar fg, main play/pause button
+; misc             = miscellaneous
diff --git a/storm.png b/storm.png
new file mode 100644
index 0000000..5ca5fc7
Binary files /dev/null and b/storm.png differ