diff --git a/index.theme b/index.theme
index 9751ac6..29b94e7 100644
--- a/index.theme
+++ b/index.theme
@@ -8,13 +8,9 @@ Example=directory-x-normal
 KDE-Extensions=.svg
 
 #Directory list
-Directories=actions/16,actions/16-fixed,actions/22,actions/symbolic,actions/scalable,animations/16,animations/22,animations/24,animations/32,animations/48,animations/64,animations/128,apps/128,apps/512,categories/128,places/22,places/24,places/128,places/symbolic,mimes/scalable,devices/128,devices/symbolic,emblems/16,emblems/22,emblems/24,emblems/32,emblems/48,emblems/64,emblems/128,status/16,status/22,status/24,status/32,status/48,status/64,status/128,notifications/16,notifications/22,notifications/24,notifications/32,notifications/48,panel/24,stock/16,stock/22,stock/24,stock/32,stock/48,tools/22
-
-[actions/16]
-Size=16
-Context=Actions
-Type=Scalable
+Directories=actions/16-fixed,actions/22,actions/symbolic,actions/scalable,animations/16,animations/22,animations/24,animations/32,animations/48,animations/64,animations/128,apps/128,apps/512,categories/128,places/128,places/symbolic,mimes/scalable,devices/128,devices/symbolic,emblems/16,emblems/22,emblems/24,emblems/32,emblems/48,emblems/64,emblems/128,status/symbolic,status/scalable,panel/24,stock/16,stock/22,stock/24,stock/32,stock/48
 
+########### actions#######
 [actions/16-fixed]
 Size=16
 Context=Actions
@@ -37,6 +33,7 @@ Size=16
 Context=Actions
 Type=Scalable
 
+########### Animations #######
 [animations/16]
 Size=16
 Context=Animations
@@ -72,6 +69,7 @@ Size=128
 Context=Animations
 Type=Scalable
 
+########### apps#######
 [apps/128]
 Size=128
 Context=Applications
@@ -86,6 +84,7 @@ MinSize=8
 MaxSize=512
 Type=Scalable
 
+########### categories#######
 [categories/128]
 Size=128
 Context=Categories
@@ -108,41 +107,6 @@ MinSize=8
 MaxSize=512
 Type=Scalable
 
-[emblems/16]
-Size=16
-Context=Emblems
-Type=Scalable
-
-[emblems/22]
-Size=22
-Context=Emblems
-Type=Scalable
-
-[emblems/24]
-Size=24
-Context=Emblems
-Type=Scalable
-
-[emblems/32]
-Size=32
-Context=Emblems
-Type=Scalable
-
-[emblems/48]
-Size=48
-Context=Emblems
-Type=Scalable
-
-[emblems/64]
-Size=64
-Context=Emblems
-Type=Scalable
-
-[emblems/128]
-Size=128
-Context=Emblems
-Type=Scalable
-
 [mimes/scalable]
 Size=128
 Context=MimeTypes
@@ -168,69 +132,22 @@ Type=Scalable
 
 #########################
 
-[status/16]
+[status/symbolic]
 Size=16
 Context=Status
 Type=Scalable
 
-[status/22]
+[status/scalable]
 Size=22
 Context=Status
 Type=Scalable
 
-[status/24]
-Size=24
-Context=Status
-Type=Scalable
-
-[status/32]
-Size=32
-Context=Status
-Type=Scalable
-
-[status/48]
-Size=48
-Context=Status
-Type=Scalable
-
-[status/64]
-Size=64
-Context=Status
-Type=Scalable
-
-[status/128]
-Size=128
-Context=Status
-Type=Scalable
-
-[notifications/16]
-Size=16
-Context=Status
-Type=Scalable
-
-[notifications/22]
-Size=22
-Context=Status
-Type=Scalable
-
-[notifications/24]
-Size=24
-Context=Status
-Type=Scalable
-
-[notifications/32]
-Size=32
-Context=Status
-Type=Scalable
-
-[notifications/48]
-Size=48
-Context=Status
-Type=Scalable
 
 [panel/24]
 Size=24
 Context=Status
+MinSize=8
+MaxSize=48
 Type=Scalable
 
 [stock/16]
@@ -258,7 +175,3 @@ Size=48
 Context=Stock
 Type=Scalable
 
-[tools/22]
-Size=22
-Context=Actions
-Type=Scalable