raster pushed a commit to branch feature/themes/flat.

http://git.enlightenment.org/core/efl.git/commit/?id=505c200f0bf9232c4302d773ac19a21a28b6744f

commit 505c200f0bf9232c4302d773ac19a21a28b6744f
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Thu Aug 27 20:50:48 2020 +0100

    TH - icooonz
---
 data/elementary/themes/edc/O/efm_icons.edc         |  21 --
 data/elementary/themes/edc/O/icons.edc             |   6 +-
 data/elementary/themes/edc/icons.edc               |  18 +-
 data/elementary/themes/ic.edc                      |  40 ++--
 data/elementary/themes/img/device-block.svg        | 216 +++++++++++++++++++++
 data/elementary/themes/img/device-char.svg         | 188 ++++++++++++++++++
 data/elementary/themes/img/device-pipe.svg         | 127 ++++++++++++
 data/elementary/themes/img/device-socket.svg       | 146 ++++++++++++++
 data/elementary/themes/img/efm-c.svg               | 146 ++++++++++++++
 data/elementary/themes/img/efm-cpp.svg             | 146 ++++++++++++++
 data/elementary/themes/img/efm-h.svg               | 146 ++++++++++++++
 data/elementary/themes/img/efm-hpp.svg             | 146 ++++++++++++++
 data/elementary/themes/img/efm-sh.svg              | 118 +++++++++++
 data/elementary/themes/img/efm-txt.svg             | 194 ++++++++++++++++++
 data/elementary/themes/img/file2.svg               | 117 +++++++++++
 .../themes/img/{folder.svg => folder-locked.svg}   | 170 ++++++++--------
 data/elementary/themes/img/folder.svg              | 166 ++++++++--------
 data/elementary/themes/img/ic/efm-c-040.png        | Bin 0 -> 975 bytes
 data/elementary/themes/img/ic/efm-c-080.png        | Bin 0 -> 1909 bytes
 data/elementary/themes/img/ic/efm-c-160.png        | Bin 0 -> 3880 bytes
 data/elementary/themes/img/ic/efm-cpp-040.png      | Bin 0 -> 1184 bytes
 data/elementary/themes/img/ic/efm-cpp-080.png      | Bin 0 -> 2103 bytes
 data/elementary/themes/img/ic/efm-cpp-160.png      | Bin 0 -> 4116 bytes
 .../themes/img/ic/efm-device-block-040.png         | Bin 0 -> 1585 bytes
 .../themes/img/ic/efm-device-block-080.png         | Bin 0 -> 3246 bytes
 .../themes/img/ic/efm-device-block-160.png         | Bin 0 -> 6157 bytes
 .../themes/img/ic/efm-device-char-040.png          | Bin 0 -> 451 bytes
 .../themes/img/ic/efm-device-char-080.png          | Bin 0 -> 579 bytes
 .../themes/img/ic/efm-device-char-160.png          | Bin 0 -> 861 bytes
 .../themes/img/ic/efm-device-pipe-040.png          | Bin 0 -> 634 bytes
 .../themes/img/ic/efm-device-pipe-080.png          | Bin 0 -> 967 bytes
 .../themes/img/ic/efm-device-pipe-160.png          | Bin 0 -> 1776 bytes
 .../themes/img/ic/efm-device-socket-040.png        | Bin 0 -> 473 bytes
 .../themes/img/ic/efm-device-socket-080.png        | Bin 0 -> 806 bytes
 .../themes/img/ic/efm-device-socket-160.png        | Bin 0 -> 1625 bytes
 data/elementary/themes/img/ic/efm-file2-040.png    | Bin 0 -> 423 bytes
 data/elementary/themes/img/ic/efm-file2-080.png    | Bin 0 -> 705 bytes
 data/elementary/themes/img/ic/efm-file2-160.png    | Bin 0 -> 1240 bytes
 data/elementary/themes/img/ic/efm-folder-040.png   | Bin 420 -> 376 bytes
 data/elementary/themes/img/ic/efm-folder-080.png   | Bin 728 -> 658 bytes
 data/elementary/themes/img/ic/efm-folder-160.png   | Bin 1283 -> 1173 bytes
 .../themes/img/ic/efm-folder-locked-040.png        | Bin 0 -> 582 bytes
 .../themes/img/ic/efm-folder-locked-080.png        | Bin 0 -> 1027 bytes
 .../themes/img/ic/efm-folder-locked-160.png        | Bin 0 -> 1867 bytes
 data/elementary/themes/img/ic/efm-h-040.png        | Bin 0 -> 878 bytes
 data/elementary/themes/img/ic/efm-h-080.png        | Bin 0 -> 1635 bytes
 data/elementary/themes/img/ic/efm-h-160.png        | Bin 0 -> 3241 bytes
 data/elementary/themes/img/ic/efm-hpp-040.png      | Bin 0 -> 1073 bytes
 data/elementary/themes/img/ic/efm-hpp-080.png      | Bin 0 -> 1842 bytes
 data/elementary/themes/img/ic/efm-hpp-160.png      | Bin 0 -> 3527 bytes
 data/elementary/themes/img/ic/efm-sh-040.png       | Bin 0 -> 952 bytes
 data/elementary/themes/img/ic/efm-sh-080.png       | Bin 0 -> 1488 bytes
 data/elementary/themes/img/ic/efm-sh-160.png       | Bin 0 -> 2642 bytes
 data/elementary/themes/img/ic/efm-symlink-040.png  | Bin 0 -> 587 bytes
 data/elementary/themes/img/ic/efm-symlink-080.png  | Bin 0 -> 777 bytes
 data/elementary/themes/img/ic/efm-symlink-160.png  | Bin 0 -> 1313 bytes
 data/elementary/themes/img/ic/efm-txt-040.png      | Bin 0 -> 504 bytes
 data/elementary/themes/img/ic/efm-txt-080.png      | Bin 0 -> 874 bytes
 data/elementary/themes/img/ic/efm-txt-160.png      | Bin 0 -> 1456 bytes
 data/elementary/themes/img/symlink.svg             | 188 ++++++++++++++++++
 60 files changed, 2073 insertions(+), 226 deletions(-)

diff --git a/data/elementary/themes/edc/O/efm_icons.edc 
b/data/elementary/themes/edc/O/efm_icons.edc
index 1334e479b1..ae96478f13 100644
--- a/data/elementary/themes/edc/O/efm_icons.edc
+++ b/data/elementary/themes/edc/O/efm_icons.edc
@@ -174,10 +174,6 @@
 
 //Code//
 
-   EFM_MIME_ICON("text/x-csrc","efm_generic_icon_content_code.png", (114/88), 
(114/88), ".C", 240, 0.3);
-   EFM_MIME_ICON("text/x-chdr","efm_generic_icon_content_code.png", (114/88), 
(114/88), ".H", 240, 0.3);
-   EFM_MIME_ICON("text/x-c++hdr","efm_generic_icon_content_code.png", 
(114/88), (114/88), ".HH", 240, 0.3);
-   EFM_MIME_ICON("text/x-c++src","efm_generic_icon_content_code.png", 
(114/88), (114/88), ".C++", 240, 0.3);
    EFM_MIME_ICON("text/x-csharp","efm_generic_icon_content_code.png", 
(114/88), (114/88), ".C#", 240, 0.3);
    EFM_MIME_ICON("application/x-awk","efm_generic_icon_content_code.png", 
(114/88), (114/88), ".AWK", 240, 0.3);
    EFM_MIME_ICON("text/x-hdr","efm_generic_icon_content_code.png", (114/88), 
(114/88), ".HPP", 240, 0.3);
@@ -190,7 +186,6 @@
 //Text//   
 
    EFM_MIME_ICON("text/x-patch","efm_generic_icon_content_text.png", 
(114/126), (114/126), ".PATCH", 240, 0.5);
-   EFM_MIME_ICON("text/plain","efm_generic_icon_content_text.png", (114/126), 
(114/126), ".TXT", 240, 0.5);
    EFM_MIME_ICON("text/x-log","efm_generic_icon_content_text.png",  (114/126), 
(114/126), ".LOG", 240, 0.5);
    EFM_MIME_ICON("application/x-md5","efm_generic_icon_content_text.png",  
(114/126), (114/126), ".MD5", 240, 0.5);
    EFM_MIME_ICON("text/x-makefile","efm_generic_icon_content_text.png",  
(114/126), (114/126), ".MK", 240, 0.5);
@@ -358,10 +353,6 @@
       } \
    }
 
-//Script//
-   
-   
EFM_MIME_ICON_SIMPLE("application/x-shellscript","efm_generic_icon_content_script.png",
 (114/126), (114/126), 240, 0.5);
-
 //Executable//
 
    
EFM_MIME_ICON_SIMPLE("application/x-executable","efm_generic_icon_content_executable.png",
 (114/114), (114/114), 240, 0.5);
@@ -380,10 +371,6 @@
 
    
EFM_MIME_ICON_SIMPLE("application/x-trash","efm_generic_icon_content_trash.png",
 (114/142), (114/142), 240, 0.5);
 
-//Octet-Stream//
-   
-   
EFM_MIME_ICON_SIMPLE("application/octet-stream","efm_generic_icon_content_text.png",(114/126),
 (114/126), 240, 0.5);
-
 //Install//
 
    
EFM_MIME_ICON_SIMPLE("application/x-install-instructions","efm_generic_icon_content_install.png",(114/149),
 (114/149), 240, 0.5);
@@ -392,14 +379,6 @@
 
    EFM_MIME_ICON_SIMPLE("chemical/x-cache","efm_generic_icon_content_db.png", 
(114/128), (114/128), 240, 0.5);
 
-//Inode//
-   
-   
EFM_MIME_ICON_SIMPLE("inode/chardevice","efm_generic_icon_content_inode_char.png",
 (114/77), (114/77), 240, 0.5);
-   
EFM_MIME_ICON_SIMPLE("inode/blockdevice","efm_generic_icon_content_inode_block.png",
 (81/114), (81/114), 240, 0.5);
-   
EFM_MIME_ICON_SIMPLE("inode/fifo","efm_generic_icon_content_inode_fifo.png", 
(87/114), (87/114), 240, 0.5);
-   
EFM_MIME_ICON_SIMPLE("inode/socket","efm_generic_icon_content_inode_socket.png",
 (114/114), (114/114), 240, 0.5);
-   
EFM_MIME_ICON_SIMPLE("inode/file","efm_generic_icon_content_inode_file.png", 
(83/114), (83/114), 240, 0.5);
-
 #undefine EFM_MIME_ICON
 #undefine EFM_MIME_ICON_SIMPLE
 
diff --git a/data/elementary/themes/edc/O/icons.edc 
b/data/elementary/themes/edc/O/icons.edc
index 663056d617..82d7bc9df0 100644
--- a/data/elementary/themes/edc/O/icons.edc
+++ b/data/elementary/themes/edc/O/icons.edc
@@ -66,8 +66,4 @@
    ICON("modules-core","logo_white_128.png",64)
    ICON("modules-mobile","icon_globe.png",64)
    ICON("modules-settings","icon_config.png",64)
-   ICONMIME("inode/chardevice","icon_efm_file.png",128)
-   ICONMIME("inode/blockdevice","icon_efm_file.png",128)
-   ICONMIME("inode/directory-locked","icon_efm_file.png",128)
-   ICONMIME("inode/fifo","icon_efm_file.png",128)
-   ICONMIME("inode/socket","icon_efm_file.png",128)
+
diff --git a/data/elementary/themes/edc/icons.edc 
b/data/elementary/themes/edc/icons.edc
index c6bfda3231..e07d9d45f6 100644
--- a/data/elementary/themes/edc/icons.edc
+++ b/data/elementary/themes/edc/icons.edc
@@ -14,7 +14,6 @@
    ICON("system-file-manager", "i-folder")
    ICON("folder", "i-folder")
    ICON("folder-image", "i-folder")
-   ICON("inode/directory", "i-folder")
    ICON("user-home", "i-home")
    ICON("user-desktop", "i-desktop")
    ICON("user-temp", "i-temp")
@@ -222,6 +221,7 @@
 // mime icons
 #define ICON(_NAME, _ICON) \
    group { name: "e/icons/fileman/mime/"_NAME; \
+      alias: "e/icons/mimetypes/"_NAME; \
       parts { \
          part { name: "icon"; mouse_events: 0; \
             description { state: "default" 0.0; \
@@ -231,7 +231,23 @@
          } \
       } \
    }
+   ICON("inode/file", "i-file2")
    ICON("inode/directory", "i-folder")
+   ICON("inode/directory-locked", "i-folder-locked")
+   ICON("inode/chardevice", "i-device-char")
+   ICON("inode/blockdevice", "i-device-block")
+   ICON("inode/fifo", "i-device-pipe")
+   ICON("inode/socket", "i-device-socket")
+   ICON("inode/symlink", "i-symlink")
+
+   ICON("application/octet-stream", "i-file2")
+
+   ICON("text/plain", "i-efm-txt")
+   ICON("text/x-csrc", "i-efm-c")
+   ICON("text/x-chdr", "i-efm-h")
+   ICON("text/x-c++src", "i-efm-cpp")
+   ICON("text/x-c++hdr", "i-efm-hpp")
+   ICON("application/x-shellscript", "i-efm-sh")
 #undef ICON
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/data/elementary/themes/ic.edc b/data/elementary/themes/ic.edc
index 20d3498851..ec0761d705 100644
--- a/data/elementary/themes/ic.edc
+++ b/data/elementary/themes/ic.edc
@@ -152,8 +152,21 @@ I160("i-drive-hdd", "efm-drive-hdd")
 I160("i-drive-usb-media", "efm-drive-usb-media")
 I160("i-favorite", "efm-favorite")
 I160("i-folder", "efm-folder")
+I160("i-folder-locked", "efm-folder-locked")
 I160("i-home", "efm-home")
 I160("i-temp", "efm-temp")
+I160("i-device-char", "efm-device-char")
+I160("i-device-block", "efm-device-block")
+I160("i-device-pipe", "efm-device-pipe")
+I160("i-device-socket", "efm-device-socket")
+I160("i-symlink", "efm-symlink")
+I160("i-file2", "efm-file2")
+I160("i-efm-txt", "efm-txt")
+I160("i-efm-c", "efm-c")
+I160("i-efm-h", "efm-h")
+I160("i-efm-cpp", "efm-cpp")
+I160("i-efm-hpp", "efm-hpp")
+I160("i-efm-sh", "efm-sh")
 
 I160("i-folder-open", "folder-open")
 I160("i-file-properties", "file-properties")
@@ -304,12 +317,6 @@ I160("i-unknown", "unknown")
    ICON("modules-core","logo_white_128.png",64)
    ICON("network-website","icon_globe.png",64)                     // 
"enlightenment/website"
 
-   ICONMIME("inode/chardevice","icon_efm_file.png",128)
-   ICONMIME("inode/blockdevice","icon_efm_file.png",128)
-   ICONMIME("inode/directory-locked","icon_efm_file.png",128)
-   ICONMIME("inode/directory","icon_efm_folder.png",128)
-   ICONMIME("inode/fifo","icon_efm_file.png",128)
-   ICONMIME("inode/socket","icon_efm_file.png",128)
 
 #define EFM_MIME_ICON(_NAME, _IMAGE, _ASPMIN, _ASPMAX, _STRING, _SIZE, 
_VALIGN) \
    group { name: "e/icons/fileman/mime/"_NAME; \
@@ -483,10 +490,6 @@ I160("i-unknown", "unknown")
 
 //Code//
 
-   EFM_MIME_ICON("text/x-csrc","efm_generic_icon_content_code.png", (114/88), 
(114/88), ".C", 240, 0.3);
-   EFM_MIME_ICON("text/x-chdr","efm_generic_icon_content_code.png", (114/88), 
(114/88), ".H", 240, 0.3);
-   EFM_MIME_ICON("text/x-c++hdr","efm_generic_icon_content_code.png", 
(114/88), (114/88), ".HH", 240, 0.3);
-   EFM_MIME_ICON("text/x-c++src","efm_generic_icon_content_code.png", 
(114/88), (114/88), ".C++", 240, 0.3);
    EFM_MIME_ICON("text/x-csharp","efm_generic_icon_content_code.png", 
(114/88), (114/88), ".C#", 240, 0.3);
    EFM_MIME_ICON("application/x-awk","efm_generic_icon_content_code.png", 
(114/88), (114/88), ".AWK", 240, 0.3);
    EFM_MIME_ICON("text/x-hdr","efm_generic_icon_content_code.png", (114/88), 
(114/88), ".HPP", 240, 0.3);
@@ -499,7 +502,6 @@ I160("i-unknown", "unknown")
 //Text//   
 
    EFM_MIME_ICON("text/x-patch","efm_generic_icon_content_text.png", 
(114/126), (114/126), ".PATCH", 240, 0.5);
-   EFM_MIME_ICON("text/plain","efm_generic_icon_content_text.png", (114/126), 
(114/126), ".TXT", 240, 0.5);
    EFM_MIME_ICON("text/x-log","efm_generic_icon_content_text.png",  (114/126), 
(114/126), ".LOG", 240, 0.5);
    EFM_MIME_ICON("application/x-md5","efm_generic_icon_content_text.png",  
(114/126), (114/126), ".MD5", 240, 0.5);
    EFM_MIME_ICON("text/x-makefile","efm_generic_icon_content_text.png",  
(114/126), (114/126), ".MK", 240, 0.5);
@@ -667,10 +669,6 @@ I160("i-unknown", "unknown")
       } \
    }
 
-//Script//
-   
-   
EFM_MIME_ICON_SIMPLE("application/x-shellscript","efm_generic_icon_content_script.png",
 (114/126), (114/126), 240, 0.5);
-
 //Executable//
 
    
EFM_MIME_ICON_SIMPLE("application/x-executable","efm_generic_icon_content_executable.png",
 (114/114), (114/114), 240, 0.5);
@@ -689,10 +687,6 @@ I160("i-unknown", "unknown")
 
    
EFM_MIME_ICON_SIMPLE("application/x-trash","efm_generic_icon_content_trash.png",
 (114/142), (114/142), 240, 0.5);
 
-//Octet-Stream//
-   
-   
EFM_MIME_ICON_SIMPLE("application/octet-stream","efm_generic_icon_content_text.png",(114/126),
 (114/126), 240, 0.5);
-
 //Install//
 
    
EFM_MIME_ICON_SIMPLE("application/x-install-instructions","efm_generic_icon_content_install.png",(114/149),
 (114/149), 240, 0.5);
@@ -701,14 +695,6 @@ I160("i-unknown", "unknown")
 
    EFM_MIME_ICON_SIMPLE("chemical/x-cache","efm_generic_icon_content_db.png", 
(114/128), (114/128), 240, 0.5);
 
-//Inode//
-   
-   
EFM_MIME_ICON_SIMPLE("inode/chardevice","efm_generic_icon_content_inode_char.png",
 (114/77), (114/77), 240, 0.5);
-   
EFM_MIME_ICON_SIMPLE("inode/blockdevice","efm_generic_icon_content_inode_block.png",
 (81/114), (81/114), 240, 0.5);
-   
EFM_MIME_ICON_SIMPLE("inode/fifo","efm_generic_icon_content_inode_fifo.png", 
(87/114), (87/114), 240, 0.5);
-   
EFM_MIME_ICON_SIMPLE("inode/socket","efm_generic_icon_content_inode_socket.png",
 (114/114), (114/114), 240, 0.5);
-   
EFM_MIME_ICON_SIMPLE("inode/file","efm_generic_icon_content_inode_file.png", 
(83/114), (83/114), 240, 0.5);
-
 #undefine EFM_MIME_ICON
 #undefine EFM_MIME_ICON_SIMPLE
 
diff --git a/data/elementary/themes/img/device-block.svg 
b/data/elementary/themes/img/device-block.svg
new file mode 100644
index 0000000000..8c494090c4
--- /dev/null
+++ b/data/elementary/themes/img/device-block.svg
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   version="1.1"
+   id="svg2"
+   width="80"
+   height="80"
+   viewBox="0 0 80 80"
+   sodipodi:docname="device-block.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   
inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/efm-device-block-040.png"
+   inkscape:export-xdpi="48"
+   inkscape:export-ydpi="48">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect878" />
+    <rect
+       x="20"
+       y="50"
+       width="40"
+       height="30"
+       id="rect872" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect864" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect858" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect852" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#404040"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="15.175"
+     inkscape:cx="40"
+     inkscape:cy="40"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     showguides="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-nodes="true"
+     borderlayer="true">
+    <inkscape:grid
+       snapvisiblegridlinesonly="true"
+       enabled="true"
+       type="xygrid"
+       id="grid837" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <rect
+       ry="0"
+       
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:7.61097;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect945"
+       width="46"
+       height="64"
+       x="17"
+       y="11" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       id="path852"
+       d="M 63,11 57,4.9999995 22.909073,4.878613 17,11 Z"
+       
style="fill:#a0a0a0;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
 />
+    <path
+       sodipodi:nodetypes="ccccc"
+       id="path875"
+       d="M 22,9 H 58 L 56,7 H 24 Z"
+       
style="fill:#000000;fill-opacity:0.5;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
 />
+    <ellipse
+       
style="fill:#303030;fill-opacity:1;stroke:none;stroke-width:7.90525;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path947"
+       cx="40.014526"
+       cy="35.014542"
+       rx="20.915979"
+       ry="20.915991" />
+    <rect
+       
style="fill:#303030;fill-opacity:1;stroke:none;stroke-width:10.0612;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect949"
+       width="13.31017"
+       height="13.310238"
+       x="21.000002"
+       y="15.999945" />
+    <path
+       
style="fill:#303030;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.90144px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 21,38.817382 v 28.52179 l 3.802907,3.802931 30.423244,7.2e-5 
3.802906,-3.80293 V 61.634886 L 55.226151,57.832029 H 51.423246 L 
47.62034,54.0291 Z"
+       id="path953"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc" />
+    <ellipse
+       
style="fill:#8c7047;fill-opacity:1;stroke:none;stroke-width:7.98509;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path959"
+       cx="40.014526"
+       cy="35.014542"
+       rx="19.014528"
+       ry="19.01454" />
+    <ellipse
+       ry="7.6057706"
+       rx="7.6058121"
+       cy="35.014542"
+       cx="40.014526"
+       id="ellipse983"
+       
style="fill:#745d3b;fill-opacity:1;stroke:none;stroke-width:3.19403;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <circle
+       
style="fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:7.1866;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path961"
+       cx="40.014526"
+       cy="35.014542"
+       r="5.7043581" />
+    <circle
+       
style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:7.1866;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path963"
+       cx="40.014526"
+       cy="35.014542"
+       r="1.9014527" />
+    <path
+       
style="fill:#505050;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.90144px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 38.113075,69.240673 h 15.211621 l 3.802907,-3.802857 V 63.536315 L 
53.324696,59.733459 H 38.113075 Z"
+       id="path969"
+       inkscape:connector-curvature="0" />
+    <path
+       
style="fill:#a0a0a0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.90144px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 22.901453,17.901449 v 5.704358 l 5.704358,-5.704358 z"
+       id="path967"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       
style="fill:#745e36;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.90144px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 40.014528,65.437816 h 9.507263 v -1.901501 h 1.901455 v 3.80293 H 
40.014528 Z"
+       id="path971"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <rect
+       
style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:7.1866;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect973"
+       width="5.7043581"
+       height="1.9014527"
+       x="47.620338"
+       y="61.63485" />
+    <path
+       
style="fill:#a0a0a0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.90144px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 22.901453,65.437816 3.802905,3.802857 H 40.01453 l 
3.802903,-3.802857 v -5.704357 l -3.802903,-3.80293 h -7.605814 l 
-9.507263,-7.605787 z"
+       id="path965"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       
style="fill:#fefefe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.90144px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 28.605811,61.634886 38.113075,50.22617 h 1.901453 l 
7.60581,-7.605786 -15.211622,22.817432 z"
+       id="path975"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <ellipse
+       
style="fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:14.3732;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path977"
+       cx="30.507265"
+       cy="63.536331"
+       rx="3.8029048"
+       ry="3.8029118" />
+    <circle
+       
style="fill:#a0a0a0;fill-opacity:1;stroke:none;stroke-width:7.1866;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path979"
+       cx="30.507265"
+       cy="63.536331"
+       r="1.9014527" />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/device-char.svg 
b/data/elementary/themes/img/device-char.svg
new file mode 100644
index 0000000000..8cf955abca
--- /dev/null
+++ b/data/elementary/themes/img/device-char.svg
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   version="1.1"
+   id="svg2"
+   width="80"
+   height="80"
+   viewBox="0 0 80 80"
+   sodipodi:docname="device-char.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   
inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/efm-device-char-040.png"
+   inkscape:export-xdpi="48"
+   inkscape:export-ydpi="48">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect878" />
+    <rect
+       x="20"
+       y="50"
+       width="40"
+       height="30"
+       id="rect872" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect864" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect858" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect852" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#404040"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="15.175"
+     inkscape:cx="40"
+     inkscape:cy="40"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     showguides="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-nodes="true"
+     borderlayer="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid837" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <rect
+       y="40"
+       x="20"
+       height="35"
+       width="40"
+       id="rect850"
+       
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.24721;stroke-linecap:round;stroke-linejoin:round"
 />
+    <path
+       sodipodi:nodetypes="ccccc"
+       id="path852"
+       d="M 60,40 54,34 H 26 l -6,6 z"
+       
style="fill:#a0a0a0;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
 />
+    <rect
+       y="28"
+       x="38"
+       height="4"
+       width="4"
+       id="rect854"
+       
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
 />
+    <rect
+       
style="fill:#deaa87;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
+       id="rect856"
+       width="4"
+       height="4"
+       x="43"
+       y="21" />
+    <rect
+       y="22"
+       x="33"
+       height="4"
+       width="4"
+       id="rect859"
+       
style="fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
 />
+    <rect
+       
style="fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
+       id="rect861"
+       width="4"
+       height="4"
+       x="46"
+       y="14" />
+    <rect
+       y="15"
+       x="28"
+       height="4"
+       width="4"
+       id="rect863"
+       
style="fill:#55ff55;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
 />
+    <rect
+       
style="fill:#ccff00;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
+       id="rect865"
+       width="4"
+       height="4"
+       x="38"
+       y="8" />
+    <rect
+       y="4"
+       x="49"
+       height="4"
+       width="4"
+       id="rect867"
+       
style="fill:#dd55ff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
 />
+    <rect
+       y="11"
+       x="20"
+       height="4"
+       width="4"
+       id="rect869"
+       
style="fill:#ff8080;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
 />
+    <rect
+       
style="fill:#5f5fd3;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
+       id="rect871"
+       width="4"
+       height="4"
+       x="28"
+       y="4" />
+    <rect
+       y="14"
+       x="54"
+       height="4"
+       width="4"
+       id="rect873"
+       
style="fill:#00d4aa;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
 />
+    <path
+       sodipodi:nodetypes="ccccc"
+       id="path875"
+       d="M 25,38 H 55 L 53,36 H 27 Z"
+       
style="fill:#000000;fill-opacity:0.5;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
 />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/device-pipe.svg 
b/data/elementary/themes/img/device-pipe.svg
new file mode 100644
index 0000000000..360eb03615
--- /dev/null
+++ b/data/elementary/themes/img/device-pipe.svg
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   version="1.1"
+   id="svg2"
+   width="80"
+   height="80"
+   viewBox="0 0 80 80"
+   sodipodi:docname="device-pipe.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   
inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/efm-device-pipe-040.png"
+   inkscape:export-xdpi="48"
+   inkscape:export-ydpi="48">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect878" />
+    <rect
+       x="20"
+       y="50"
+       width="40"
+       height="30"
+       id="rect872" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect864" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect858" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect852" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#404040"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="15.1875"
+     inkscape:cx="40"
+     inkscape:cy="39.967078"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     showguides="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-nodes="true"
+     borderlayer="true">
+    <inkscape:grid
+       snapvisiblegridlinesonly="true"
+       enabled="true"
+       type="xygrid"
+       id="grid837" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <rect
+       y="5"
+       x="20"
+       height="70"
+       width="40"
+       id="rect3951"
+       
style="fill:#ffffff;fill-opacity:0.15;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
 />
+    <path
+       d="M 28.820312 25 A 15 15 0 0 0 25 35 A 15 15 0 0 0 28.822266 45 L 
51.179688 45 A 15 15 0 0 0 55 35 A 15 15 0 0 0 51.179688 25 L 28.820312 25 z "
+       
style="fill:#ffffff;fill-opacity:0.15;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
+       id="path3953" />
+    <circle
+       r="2"
+       cy="40"
+       cx="40"
+       id="path3964"
+       
style="fill:#ffffff;fill-opacity:0.15;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
 />
+    <rect
+       y="29"
+       x="33"
+       height="6"
+       width="4"
+       id="rect3966"
+       
style="fill:#ffffff;fill-opacity:0.15;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
 />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/device-socket.svg 
b/data/elementary/themes/img/device-socket.svg
new file mode 100644
index 0000000000..0d5b97ba20
--- /dev/null
+++ b/data/elementary/themes/img/device-socket.svg
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   version="1.1"
+   id="svg2"
+   width="80"
+   height="80"
+   viewBox="0 0 80 80"
+   sodipodi:docname="device-socket.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   
inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/efm-device-socket-040.png"
+   inkscape:export-xdpi="48"
+   inkscape:export-ydpi="48">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect878" />
+    <rect
+       x="20"
+       y="50"
+       width="40"
+       height="30"
+       id="rect872" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect864" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect858" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect852" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#404040"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="15.1875"
+     inkscape:cx="40"
+     inkscape:cy="40"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     showguides="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-nodes="true"
+     borderlayer="true">
+    <inkscape:grid
+       snapvisiblegridlinesonly="true"
+       enabled="true"
+       type="xygrid"
+       id="grid837" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <rect
+       y="5"
+       x="20"
+       height="70"
+       width="40"
+       id="rect3951"
+       
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
 />
+    <path
+       d="M 29.417969,28 A 16,16 0 0 0 24,40 16,16 0 0 0 29.417969,52 H 
50.580078 A 16,16 0 0 0 56,40 16,16 0 0 0 50.580078,28 Z"
+       
style="fill:#ffffff;fill-opacity:0.2;stroke:none;stroke-width:2.13334;stroke-linecap:round;stroke-linejoin:round"
+       id="path3970" />
+    <circle
+       r="2"
+       cy="46"
+       cx="40"
+       id="path3964"
+       
style="fill:#000000;fill-opacity:0.984276;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
 />
+    <rect
+       y="32"
+       x="43"
+       height="6"
+       width="4"
+       id="rect3966"
+       
style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
 />
+    <rect
+       
style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
+       id="rect3968"
+       width="4"
+       height="6"
+       x="33"
+       y="32" />
+    <circle
+       
style="fill:#000000;fill-opacity:0.15;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
+       id="circle3981"
+       cx="40"
+       cy="11"
+       r="2" />
+    <circle
+       r="2"
+       cy="69"
+       cx="40"
+       id="circle3983"
+       
style="fill:#000000;fill-opacity:0.15;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
 />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/efm-c.svg 
b/data/elementary/themes/img/efm-c.svg
new file mode 100644
index 0000000000..9c6bf4838a
--- /dev/null
+++ b/data/elementary/themes/img/efm-c.svg
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   version="1.1"
+   id="svg2"
+   width="80"
+   height="80"
+   viewBox="0 0 80 80"
+   sodipodi:docname="efm-c.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/efm-c-040.png"
+   inkscape:export-xdpi="48"
+   inkscape:export-ydpi="48">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <rect
+       id="rect1822"
+       height="22.426638"
+       width="47.970909"
+       y="8"
+       x="16" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect878" />
+    <rect
+       x="20"
+       y="50"
+       width="40"
+       height="30"
+       id="rect872" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect864" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect858" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect852" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:showpageshadow="false"
+     inkscape:document-rotation="0"
+     pagecolor="#404040"
+     bordercolor="#ff66ac"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="15.0875"
+     inkscape:cx="40"
+     inkscape:cy="40.23198"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     showguides="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-nodes="true"
+     borderlayer="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid837" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <path
+       sodipodi:nodetypes="cccccc"
+       
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 68,4 V 76 H 12 V 25 L 34,4 Z"
+       id="path27896" />
+    <text
+       transform="translate(0.02909091,19.573362)"
+       style="font-size:7px;line-height:6.87873px;font-family:'Arial 
Black';-inkscape-font-specification:'Arial Black, 
';letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect1822);fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text1820"
+       xml:space="preserve"><tspan
+         x="16"
+         y="13.348456"><tspan
+           
style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:extra-condensed;font-size:7px;font-family:'Input
 Mono Compressed';-inkscape-font-specification:'Input Mono Compressed 
Ultra-Bold Extra-Condensed';fill:#000000;fill-opacity:1;stroke:none">int main() 
{
+</tspan></tspan><tspan
+         x="16"
+         y="20.235224"><tspan
+           
style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:extra-condensed;font-size:7px;font-family:'Input
 Mono Compressed';-inkscape-font-specification:'Input Mono Compressed 
Ultra-Bold 
Extra-Condensed';fill:#000000;fill-opacity:1;stroke:none">}</tspan></tspan></text>
+    <path
+       
style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 12,25 37,30 34,4 C 33,10 19,24 12,25 Z"
+       id="path27900"
+       sodipodi:nodetypes="cccc" />
+    <path
+       sodipodi:nodetypes="cccc"
+       
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 12,25 H 34 V 4 Z"
+       id="path27898" />
+    <text
+       id="text1828"
+       y="70.118179"
+       x="40.136341"
+       style="font-size:28px;line-height:17.5px;font-family:'Arial 
Black';-inkscape-font-specification:'Arial Black, 
';letter-spacing:0px;word-spacing:0px;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.25;"
+       xml:space="preserve"><tspan
+         
style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;font-size:28px;font-family:'Input
 Mono';-inkscape-font-specification:'Input Mono 
Ultra-Bold';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;"
+         y="70.118179"
+         x="40.136341"
+         id="tspan1826"
+         sodipodi:role="line">C</tspan></text>
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/efm-cpp.svg 
b/data/elementary/themes/img/efm-cpp.svg
new file mode 100644
index 0000000000..874df105e7
--- /dev/null
+++ b/data/elementary/themes/img/efm-cpp.svg
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   version="1.1"
+   id="svg2"
+   width="80"
+   height="80"
+   viewBox="0 0 80 80"
+   sodipodi:docname="efm-cpp.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/efm-cpp-040.png"
+   inkscape:export-xdpi="48"
+   inkscape:export-ydpi="48">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <rect
+       id="rect1822"
+       height="22.426638"
+       width="47.970909"
+       y="8"
+       x="16" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect878" />
+    <rect
+       x="20"
+       y="50"
+       width="40"
+       height="30"
+       id="rect872" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect864" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect858" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect852" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:showpageshadow="false"
+     inkscape:document-rotation="0"
+     pagecolor="#404040"
+     bordercolor="#ff66ac"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="15.125"
+     inkscape:cx="40"
+     inkscape:cy="40"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     showguides="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-nodes="true"
+     borderlayer="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid837" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <path
+       sodipodi:nodetypes="cccccc"
+       
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 68,4 V 76 H 12 V 25 L 34,4 Z"
+       id="path27896" />
+    <text
+       transform="translate(0.02909091,19.573362)"
+       style="font-size:7px;line-height:6.87873px;font-family:'Arial 
Black';-inkscape-font-specification:'Arial Black, 
';letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect1822);fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text1820"
+       xml:space="preserve"><tspan
+         x="16"
+         y="13.348456"><tspan
+           
style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:extra-condensed;font-size:7px;font-family:'Input
 Mono Compressed';-inkscape-font-specification:'Input Mono Compressed 
Ultra-Bold Extra-Condensed';fill:#000000;fill-opacity:1;stroke:none">int main() 
{
+</tspan></tspan><tspan
+         x="16"
+         y="20.235224"><tspan
+           
style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:extra-condensed;font-size:7px;font-family:'Input
 Mono Compressed';-inkscape-font-specification:'Input Mono Compressed 
Ultra-Bold 
Extra-Condensed';fill:#000000;fill-opacity:1;stroke:none">}</tspan></tspan></text>
+    <path
+       
style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 12,25 37,30 34,4 C 33,10 19,24 12,25 Z"
+       id="path27900"
+       sodipodi:nodetypes="cccc" />
+    <path
+       sodipodi:nodetypes="cccc"
+       
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 12,25 H 34 V 4 Z"
+       id="path27898" />
+    <text
+       id="text1828"
+       y="70.118179"
+       x="40.136341"
+       style="font-size:28px;line-height:17.5px;font-family:'Arial 
Black';-inkscape-font-specification:'Arial Black, 
';letter-spacing:0px;word-spacing:0px;opacity:0.25;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         
style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;font-size:28px;font-family:'Input
 Mono';-inkscape-font-specification:'Input Mono 
Ultra-Bold';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+         y="70.118179"
+         x="40.136341"
+         id="tspan1826"
+         sodipodi:role="line">C++</tspan></text>
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/efm-h.svg 
b/data/elementary/themes/img/efm-h.svg
new file mode 100644
index 0000000000..9ccc161f89
--- /dev/null
+++ b/data/elementary/themes/img/efm-h.svg
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   version="1.1"
+   id="svg2"
+   width="80"
+   height="80"
+   viewBox="0 0 80 80"
+   sodipodi:docname="efm-h.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/efm-h-040.png"
+   inkscape:export-xdpi="48"
+   inkscape:export-ydpi="48">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <rect
+       id="rect1822"
+       height="22.426638"
+       width="47.970909"
+       y="8"
+       x="16" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect878" />
+    <rect
+       x="20"
+       y="50"
+       width="40"
+       height="30"
+       id="rect872" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect864" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect858" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect852" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:showpageshadow="false"
+     inkscape:document-rotation="0"
+     pagecolor="#404040"
+     bordercolor="#ff66ac"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="15.0875"
+     inkscape:cx="40"
+     inkscape:cy="40.09942"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     showguides="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-nodes="true"
+     borderlayer="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid837" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <path
+       sodipodi:nodetypes="cccccc"
+       
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 68,4 V 76 H 12 V 25 L 34,4 Z"
+       id="path27896" />
+    <text
+       transform="translate(0.02909091,19.573362)"
+       style="font-size:7px;line-height:6.87873px;font-family:'Arial 
Black';-inkscape-font-specification:'Arial Black, 
';letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect1822);fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text1820"
+       xml:space="preserve"><tspan
+         x="16"
+         y="13.348456"><tspan
+           
style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:extra-condensed;font-size:7px;font-family:'Input
 Mono Compressed';-inkscape-font-specification:'Input Mono Compressed 
Ultra-Bold Extra-Condensed';fill:#000000;fill-opacity:1;stroke:none">int main() 
{
+</tspan></tspan><tspan
+         x="16"
+         y="20.235224"><tspan
+           
style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:extra-condensed;font-size:7px;font-family:'Input
 Mono Compressed';-inkscape-font-specification:'Input Mono Compressed 
Ultra-Bold 
Extra-Condensed';fill:#000000;fill-opacity:1;stroke:none">}</tspan></tspan></text>
+    <path
+       
style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 12,25 37,30 34,4 C 33,10 19,24 12,25 Z"
+       id="path27900"
+       sodipodi:nodetypes="cccc" />
+    <path
+       sodipodi:nodetypes="cccc"
+       
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 12,25 H 34 V 4 Z"
+       id="path27898" />
+    <text
+       id="text1828"
+       y="70.118179"
+       x="40.136341"
+       style="font-size:28px;line-height:17.5px;font-family:'Arial 
Black';-inkscape-font-specification:'Arial Black, 
';letter-spacing:0px;word-spacing:0px;opacity:0.25;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         
style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;font-size:28px;font-family:'Input
 Mono';-inkscape-font-specification:'Input Mono 
Ultra-Bold';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+         y="70.118179"
+         x="40.136341"
+         id="tspan1826"
+         sodipodi:role="line">H</tspan></text>
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/efm-hpp.svg 
b/data/elementary/themes/img/efm-hpp.svg
new file mode 100644
index 0000000000..e2edc1c6b2
--- /dev/null
+++ b/data/elementary/themes/img/efm-hpp.svg
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   version="1.1"
+   id="svg2"
+   width="80"
+   height="80"
+   viewBox="0 0 80 80"
+   sodipodi:docname="efm-hpp.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/efm-hpp-040.png"
+   inkscape:export-xdpi="48"
+   inkscape:export-ydpi="48">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <rect
+       id="rect1822"
+       height="22.426638"
+       width="47.970909"
+       y="8"
+       x="16" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect878" />
+    <rect
+       x="20"
+       y="50"
+       width="40"
+       height="30"
+       id="rect872" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect864" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect858" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect852" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:showpageshadow="false"
+     inkscape:document-rotation="0"
+     pagecolor="#404040"
+     bordercolor="#ff66ac"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="15.125"
+     inkscape:cx="40"
+     inkscape:cy="40"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     showguides="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-nodes="true"
+     borderlayer="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid837" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <path
+       sodipodi:nodetypes="cccccc"
+       
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 68,4 V 76 H 12 V 25 L 34,4 Z"
+       id="path27896" />
+    <text
+       transform="translate(0.02909091,19.573362)"
+       style="font-size:7px;line-height:6.87873px;font-family:'Arial 
Black';-inkscape-font-specification:'Arial Black, 
';letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect1822);fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text1820"
+       xml:space="preserve"><tspan
+         x="16"
+         y="13.348456"><tspan
+           
style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:extra-condensed;font-size:7px;font-family:'Input
 Mono Compressed';-inkscape-font-specification:'Input Mono Compressed 
Ultra-Bold Extra-Condensed';fill:#000000;fill-opacity:1;stroke:none">int main() 
{
+</tspan></tspan><tspan
+         x="16"
+         y="20.235224"><tspan
+           
style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:extra-condensed;font-size:7px;font-family:'Input
 Mono Compressed';-inkscape-font-specification:'Input Mono Compressed 
Ultra-Bold 
Extra-Condensed';fill:#000000;fill-opacity:1;stroke:none">}</tspan></tspan></text>
+    <path
+       
style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 12,25 37,30 34,4 C 33,10 19,24 12,25 Z"
+       id="path27900"
+       sodipodi:nodetypes="cccc" />
+    <path
+       sodipodi:nodetypes="cccc"
+       
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 12,25 H 34 V 4 Z"
+       id="path27898" />
+    <text
+       id="text1828"
+       y="70.118179"
+       x="40.136341"
+       style="font-size:28px;line-height:17.5px;font-family:'Arial 
Black';-inkscape-font-specification:'Arial Black, 
';letter-spacing:0px;word-spacing:0px;opacity:0.25;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         
style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;font-size:28px;font-family:'Input
 Mono';-inkscape-font-specification:'Input Mono 
Ultra-Bold';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+         y="70.118179"
+         x="40.136341"
+         id="tspan1826"
+         sodipodi:role="line">H++</tspan></text>
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/efm-sh.svg 
b/data/elementary/themes/img/efm-sh.svg
new file mode 100644
index 0000000000..e0e73edbba
--- /dev/null
+++ b/data/elementary/themes/img/efm-sh.svg
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   version="1.1"
+   id="svg2"
+   width="80"
+   height="80"
+   viewBox="0 0 80 80"
+   sodipodi:docname="efm-sh.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/efm-sh-040.png"
+   inkscape:export-xdpi="48"
+   inkscape:export-ydpi="48">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <rect
+       id="rect1822"
+       height="39.245391"
+       width="107.861"
+       y="8"
+       x="16" />
+    <rect
+       id="rect12368"
+       height="44.666695"
+       width="53.882812"
+       y="8"
+       x="16" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#404040"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="15.1875"
+     inkscape:cx="40.119601"
+     inkscape:cy="40"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10">
+    <inkscape:grid
+       type="xygrid"
+       id="grid837" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <rect
+       
style="fill:#202020;fill-opacity:1;stroke:none;stroke-width:3.6;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2878"
+       width="72"
+       height="72"
+       x="4"
+       y="4" />
+    <path
+       
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 74,8 -2,-2 -2,2 -2,-2 -2,2 2,2 -2,2 2,2 2,-2 2,2 2,-2 -2,-2 z"
+       id="path2880" />
+    <path
+       
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 52,9 -4,4 -4,-4 2,-2 2,2 2,-2 z"
+       id="path2882" />
+    <path
+       id="path2884"
+       d="m 62,11 -4,-4 -4,4 2,2 2,-2 2,2 z"
+       
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <path
+       
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2886"
+       sodipodi:type="arc"
+       sodipodi:cx="10"
+       sodipodi:cy="10"
+       sodipodi:rx="4"
+       sodipodi:ry="4"
+       sodipodi:start="0"
+       sodipodi:end="6.2760818"
+       sodipodi:arc-type="slice"
+       d="M 14,10 A 4,4 0 0 1 10.007104,13.999994 4,4 0 0 1 
6.0000252,10.014207 4,4 0 0 1 9.9786896,6.0000568 4,4 0 0 1 13.999899,9.9715862 
L 10,10 Z" />
+    <text
+       transform="translate(-39.462377,11.089703)"
+       
style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:condensed;font-size:40px;line-height:39.3071px;font-family:'Input
 Mono Condensed';-inkscape-font-specification:'Input Mono Condensed, Ultra-Bold 
Condensed';letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect1822);opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text1820"
+       xml:space="preserve"
+       x="9.9753418"
+       y="0"><tspan
+         x="47.239777"
+         y="38.56264"><tspan
+           
style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:condensed;font-size:40px;font-family:'Input
 Mono Condensed';-inkscape-font-specification:'Input Mono Condensed, Ultra-Bold 
Condensed';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1">#!</tspan></tspan></text>
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/efm-txt.svg 
b/data/elementary/themes/img/efm-txt.svg
new file mode 100644
index 0000000000..4bb88ca5e9
--- /dev/null
+++ b/data/elementary/themes/img/efm-txt.svg
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   inkscape:export-ydpi="48"
+   inkscape:export-xdpi="48"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/efm-txt-040.png"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="efm-txt.svg"
+   viewBox="0 0 80 80"
+   height="80"
+   width="80"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <rect
+       id="rect878"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect872"
+       height="30"
+       width="40"
+       y="50"
+       x="20" />
+    <rect
+       id="rect864"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect858"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect852"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+  </defs>
+  <sodipodi:namedview
+     borderlayer="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox="true"
+     showguides="false"
+     inkscape:current-layer="g10"
+     inkscape:window-maximized="1"
+     inkscape:window-y="0"
+     inkscape:window-x="0"
+     inkscape:cy="40"
+     inkscape:cx="40"
+     inkscape:zoom="15.175"
+     showgrid="true"
+     id="namedview4"
+     inkscape:window-height="1377"
+     inkscape:window-width="2560"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#ff66ac"
+     pagecolor="#404040"
+     inkscape:document-rotation="0"
+     inkscape:showpageshadow="false">
+    <inkscape:grid
+       id="grid837"
+       type="xygrid" />
+  </sodipodi:namedview>
+  <g
+     id="g10"
+     inkscape:label="Image"
+     inkscape:groupmode="layer">
+    <path
+       id="path27896"
+       d="M 68,4 V 76 H 12 V 25 L 34,4 Z"
+       
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="cccccc" />
+    <rect
+       
style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.82805;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect28078-3"
+       width="17"
+       height="2"
+       x="30"
+       y="10" />
+    <rect
+       y="16"
+       x="23"
+       height="2"
+       width="16"
+       id="rect28082-3-5"
+       
style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.803328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <rect
+       
style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.17104;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect28080-6-7"
+       width="34"
+       height="2"
+       x="17"
+       y="22" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path27900"
+       d="M 12,25 37,30 34,4 C 33,10 19,24 12,25 Z"
+       
style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <path
+       id="path27898"
+       d="M 12,25 H 34 V 4 Z"
+       
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="cccc" />
+    <rect
+       y="28"
+       x="16"
+       height="2"
+       width="26"
+       id="rect28078"
+       
style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.02404;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <rect
+       
style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.17104;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect28080"
+       width="34"
+       height="2"
+       x="16"
+       y="34" />
+    <rect
+       y="40"
+       x="16"
+       height="2"
+       width="25"
+       id="rect28082"
+       
style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.00416;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <rect
+       
style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.27017;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect28084"
+       width="40"
+       height="2"
+       x="16"
+       y="46" />
+    <rect
+       y="52"
+       x="16"
+       height="2"
+       width="32"
+       id="rect28086"
+       
style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.13608;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <rect
+       
style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.3914;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect28088"
+       width="48"
+       height="2"
+       x="16"
+       y="58" />
+    <rect
+       
style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.920327;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect28082-3"
+       width="21"
+       height="2"
+       x="16"
+       y="64" />
+    <rect
+       y="70"
+       x="16"
+       height="2"
+       width="34"
+       id="rect28080-6"
+       
style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.17104;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/file2.svg 
b/data/elementary/themes/img/file2.svg
new file mode 100644
index 0000000000..5e3c771826
--- /dev/null
+++ b/data/elementary/themes/img/file2.svg
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   inkscape:export-ydpi="48"
+   inkscape:export-xdpi="48"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/efm-file2-040.png"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="file2.svg"
+   viewBox="0 0 80 80"
+   height="80"
+   width="80"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <rect
+       id="rect878"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect872"
+       height="30"
+       width="40"
+       y="50"
+       x="20" />
+    <rect
+       id="rect864"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect858"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect852"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+  </defs>
+  <sodipodi:namedview
+     borderlayer="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox="true"
+     showguides="false"
+     inkscape:current-layer="g10"
+     inkscape:window-maximized="1"
+     inkscape:window-y="0"
+     inkscape:window-x="0"
+     inkscape:cy="40"
+     inkscape:cx="40"
+     inkscape:zoom="15.175"
+     showgrid="true"
+     id="namedview4"
+     inkscape:window-height="1377"
+     inkscape:window-width="2560"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#ff66ac"
+     pagecolor="#404040"
+     inkscape:document-rotation="0"
+     inkscape:showpageshadow="false">
+    <inkscape:grid
+       id="grid837"
+       type="xygrid" />
+  </sodipodi:namedview>
+  <g
+     id="g10"
+     inkscape:label="Image"
+     inkscape:groupmode="layer">
+    <path
+       id="path27896"
+       d="M 68,4 V 76 H 12 V 25 L 34,4 Z"
+       
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path27900"
+       d="M 12,25 37,30 34,4 C 33,10 19,24 12,25 Z"
+       
style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <path
+       id="path27898"
+       d="M 12,25 H 34 V 4 Z"
+       
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/folder.svg 
b/data/elementary/themes/img/folder-locked.svg
similarity index 70%
copy from data/elementary/themes/img/folder.svg
copy to data/elementary/themes/img/folder-locked.svg
index 896a8e29a9..b7336c47f0 100644
--- a/data/elementary/themes/img/folder.svg
+++ b/data/elementary/themes/img/folder-locked.svg
@@ -7,16 +7,16 @@
    xmlns="http://www.w3.org/2000/svg";
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
-   inkscape:export-ydpi="48"
-   inkscape:export-xdpi="48"
-   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/spanner-040.png"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   sodipodi:docname="folder.svg"
-   viewBox="0 0 80 80"
-   height="80"
-   width="80"
+   version="1.1"
    id="svg2"
-   version="1.1">
+   width="80"
+   height="80"
+   viewBox="0 0 80 80"
+   sodipodi:docname="folder-locked.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   
inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/efm-folder-locked-040.png"
+   inkscape:export-xdpi="48"
+   inkscape:export-ydpi="48">
   <metadata
      id="metadata8">
     <rdf:RDF>
@@ -32,113 +32,111 @@
   <defs
      id="defs6">
     <mask
-       id="mask947"
-       maskUnits="userSpaceOnUse">
+       maskUnits="userSpaceOnUse"
+       id="mask947">
       <rect
-         y="5"
-         x="10"
-         height="40"
-         width="60"
+         
style="opacity:1;fill:#a0a0a0;fill-opacity:1;stroke-width:3.96122;stroke-linecap:round;stroke-linejoin:round"
          id="rect949"
-         
style="opacity:1;fill:#a0a0a0;fill-opacity:1;stroke-width:3.96122;stroke-linecap:round;stroke-linejoin:round"
 />
+         width="60"
+         height="40"
+         x="10"
+         y="5" />
     </mask>
     <mask
-       maskUnits="userSpaceOnUse"
-       id="mask3567">
+       id="mask3567"
+       maskUnits="userSpaceOnUse">
       <path
-         sodipodi:nodetypes="zzzzz"
-         id="path3569"
+         
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="M 40,10 C 19,10 20,17.832395 20,30 20,42.167605 19,70 40,70 61,70 
60,42.167605 60,30 60,17.832395 61,10 40,10 Z"
-         
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
 />
+         id="path3569"
+         sodipodi:nodetypes="zzzzz" />
     </mask>
     <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath922">
+       id="clipPath922"
+       clipPathUnits="userSpaceOnUse">
       <path
-         
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 1.3229166,295.4125 h 7.9375003 v -6.08542 c 0,-0.52917 
0,-0.52917 -0.529167,-0.52917 H 1.8520833 c -0.5291666,0 -0.5291666,0 
-0.5291667,0.52917 z"
-         id="path924"
+         sodipodi:nodetypes="ccccccc"
          inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
+         id="path924"
+         d="m 1.3229166,295.4125 h 7.9375003 v -6.08542 c 0,-0.52917 
0,-0.52917 -0.529167,-0.52917 H 1.8520833 c -0.5291666,0 -0.5291666,0 
-0.5291667,0.52917 z"
+         
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
 />
     </clipPath>
     <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath922-6">
+       id="clipPath922-6"
+       clipPathUnits="userSpaceOnUse">
       <path
-         
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 1.3229166,295.4125 h 7.9375003 v -6.08542 c 0,-0.52917 
0,-0.52917 -0.529167,-0.52917 H 1.8520833 c -0.5291666,0 -0.5291666,0 
-0.5291667,0.52917 z"
-         id="path924-7"
+         sodipodi:nodetypes="ccccccc"
          inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
+         id="path924-7"
+         d="m 1.3229166,295.4125 h 7.9375003 v -6.08542 c 0,-0.52917 
0,-0.52917 -0.529167,-0.52917 H 1.8520833 c -0.5291666,0 -0.5291666,0 
-0.5291667,0.52917 z"
+         
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
 />
     </clipPath>
   </defs>
   <sodipodi:namedview
-     inkscape:bbox-paths="true"
-     inkscape:snap-nodes="true"
-     inkscape:snap-others="false"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox="true"
-     showguides="false"
-     inkscape:current-layer="g10"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
-     inkscape:cy="40.032949"
-     inkscape:cx="40"
-     inkscape:zoom="15.175"
-     showgrid="true"
-     id="namedview4"
-     inkscape:window-height="1377"
-     inkscape:window-width="2560"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
+     inkscape:document-rotation="0"
      pagecolor="#404040"
-     inkscape:document-rotation="0">
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="15.175"
+     inkscape:cx="40"
+     inkscape:cy="40.032949"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     showguides="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-nodes="true"
+     inkscape:bbox-paths="true">
     <inkscape:grid
-       id="grid837"
-       type="xygrid" />
+       type="xygrid"
+       id="grid837" />
   </sodipodi:namedview>
   <g
-     id="g10"
+     inkscape:groupmode="layer"
      inkscape:label="Image"
-     inkscape:groupmode="layer">
+     id="g10">
     <path
-       
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 10,64.00005 H 70 V 18.000024 c 2e-6,-4.000026 2e-6,-4.000026 
-4,-4.000026 H 14 c -4,0 -4,0 -4,4.000026 z"
-       id="path871"
+       sodipodi:nodetypes="ccccccc"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="path871"
+       d="M 10,64.00005 H 70 V 18.000024 c 2e-6,-4.000026 2e-6,-4.000026 
-4,-4.000026 H 14 c -4,0 -4,0 -4,4.000026 z"
+       
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
 />
     <path
-       
style="fill:#3399ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 8,62 V 25.999998 c 0,-6 0,-6 6,-6 h 34 c 6,0 0,-6 6,-6 h 12 c 6,0 
6,0 6,6 V 62 c 0,6 0,6 -6,6 H 14 C 8,68 8,68 8,62 Z"
-       id="path869"
+       transform="matrix(7.5590552,0,0,7.5590552,-2e-7,-2169.0394)"
+       clip-path="url(#clipPath922-6)"
+       
style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 0.79374997,294.88333 v -4.7625 c 0,-0.79375 0,-0.79375 
0.79375003,-0.79375 h 4.2333333 c 0.7937501,0 10e-8,-1.05833 0.79375,-1.05833 h 
1.8520833 c 0.7937501,0 0.7937501,0.26458 0.79375,1.05833 l 1e-7,5.55625 c 
0,0.79375 0,0.79375 -0.79375,0.79375 H 1.5875 c -0.79375003,0 -0.79375003,0 
-0.79375003,-0.79375 z"
+       id="path905"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccccccccc" />
     <path
-       sodipodi:nodetypes="ccccccccccc"
-       inkscape:connector-curvature="0"
-       id="path905"
-       d="m 0.79374997,294.88333 v -4.7625 c 0,-0.79375 0,-0.79375 
0.79375003,-0.79375 h 4.2333333 c 0.7937501,0 10e-8,-1.05833 0.79375,-1.05833 h 
1.8520833 c 0.7937501,0 0.7937501,0.26458 0.79375,1.05833 l 1e-7,5.55625 c 
0,0.79375 0,0.79375 -0.79375,0.79375 H 1.5875 c -0.79375003,0 -0.79375003,0 
-0.79375003,-0.79375 z"
-       
style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       clip-path="url(#clipPath922-6)"
-       transform="matrix(7.5590552,0,0,7.5590552,-2e-7,-2169.0394)" />
-    <path
-       sodipodi:nodetypes="ccccccccccc"
-       inkscape:connector-curvature="0"
-       id="path907"
+       
style="fill:#c88040;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="M 8,62 V 25.999998 c 0,-6 0,-6 6,-6 h 32 c 8,0 0,-7.999974 
8,-7.999974 h 12 c 6,0 6,0 6,6 V 62 c 0,6 0,6 -6,6 H 14 C 8,68 8,68 8,62 Z"
-       
style="fill:#fff078;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
 />
+       id="path907"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccc" />
     <rect
-       
style="opacity:1;fill:#000000;fill-opacity:0.12549;stroke:none;stroke-width:7.55906;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect919"
-       width="63.999996"
-       height="1.9999999"
+       y="60"
        x="8"
-       y="60" />
+       height="1.9999999"
+       width="63.999996"
+       id="rect919"
+       
style="opacity:1;fill:#000000;fill-opacity:0.12549;stroke:none;stroke-width:7.55906;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <path
+       d="M 39.982422 24.099609 C 37.688856 24.024539 35.367376 24.716101 
33.447266 26.189453 C 30.878741 28.160354 29.510319 31.186192 29.503906 
34.271484 L 29.451172 34.271484 L 29.451172 37.181641 L 27.996094 37.181641 L 
27.996094 56.09375 L 51.273438 56.09375 L 51.273438 37.181641 L 49.818359 
37.181641 L 49.818359 34.271484 C 49.814567 31.415852 48.622741 28.598681 
46.363281 26.617188 C 44.543643 25.021409 42.275985 24.174692 39.982422 
24.099609 z M 39.789062 29.900391 C 40.767086 29 [...]
+       
style="fill:#000000;fill-opacity:0.25;stroke:none;stroke-width:9.90998;stroke-linecap:round;stroke-linejoin:round"
+       id="rect884" />
   </g>
 </svg>
diff --git a/data/elementary/themes/img/folder.svg 
b/data/elementary/themes/img/folder.svg
index 896a8e29a9..d4e014d104 100644
--- a/data/elementary/themes/img/folder.svg
+++ b/data/elementary/themes/img/folder.svg
@@ -7,16 +7,16 @@
    xmlns="http://www.w3.org/2000/svg";
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
-   inkscape:export-ydpi="48"
-   inkscape:export-xdpi="48"
-   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/spanner-040.png"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   sodipodi:docname="folder.svg"
-   viewBox="0 0 80 80"
-   height="80"
-   width="80"
+   version="1.1"
    id="svg2"
-   version="1.1">
+   width="80"
+   height="80"
+   viewBox="0 0 80 80"
+   sodipodi:docname="folder.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   
inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/efm-folder-040.png"
+   inkscape:export-xdpi="48"
+   inkscape:export-ydpi="48">
   <metadata
      id="metadata8">
     <rdf:RDF>
@@ -32,113 +32,107 @@
   <defs
      id="defs6">
     <mask
-       id="mask947"
-       maskUnits="userSpaceOnUse">
+       maskUnits="userSpaceOnUse"
+       id="mask947">
       <rect
-         y="5"
-         x="10"
-         height="40"
-         width="60"
+         
style="opacity:1;fill:#a0a0a0;fill-opacity:1;stroke-width:3.96122;stroke-linecap:round;stroke-linejoin:round"
          id="rect949"
-         
style="opacity:1;fill:#a0a0a0;fill-opacity:1;stroke-width:3.96122;stroke-linecap:round;stroke-linejoin:round"
 />
+         width="60"
+         height="40"
+         x="10"
+         y="5" />
     </mask>
     <mask
-       maskUnits="userSpaceOnUse"
-       id="mask3567">
+       id="mask3567"
+       maskUnits="userSpaceOnUse">
       <path
-         sodipodi:nodetypes="zzzzz"
-         id="path3569"
+         
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="M 40,10 C 19,10 20,17.832395 20,30 20,42.167605 19,70 40,70 61,70 
60,42.167605 60,30 60,17.832395 61,10 40,10 Z"
-         
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
 />
+         id="path3569"
+         sodipodi:nodetypes="zzzzz" />
     </mask>
     <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath922">
+       id="clipPath922"
+       clipPathUnits="userSpaceOnUse">
       <path
-         
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 1.3229166,295.4125 h 7.9375003 v -6.08542 c 0,-0.52917 
0,-0.52917 -0.529167,-0.52917 H 1.8520833 c -0.5291666,0 -0.5291666,0 
-0.5291667,0.52917 z"
-         id="path924"
+         sodipodi:nodetypes="ccccccc"
          inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
+         id="path924"
+         d="m 1.3229166,295.4125 h 7.9375003 v -6.08542 c 0,-0.52917 
0,-0.52917 -0.529167,-0.52917 H 1.8520833 c -0.5291666,0 -0.5291666,0 
-0.5291667,0.52917 z"
+         
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
 />
     </clipPath>
     <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath922-6">
+       id="clipPath922-6"
+       clipPathUnits="userSpaceOnUse">
       <path
-         
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 1.3229166,295.4125 h 7.9375003 v -6.08542 c 0,-0.52917 
0,-0.52917 -0.529167,-0.52917 H 1.8520833 c -0.5291666,0 -0.5291666,0 
-0.5291667,0.52917 z"
-         id="path924-7"
+         sodipodi:nodetypes="ccccccc"
          inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
+         id="path924-7"
+         d="m 1.3229166,295.4125 h 7.9375003 v -6.08542 c 0,-0.52917 
0,-0.52917 -0.529167,-0.52917 H 1.8520833 c -0.5291666,0 -0.5291666,0 
-0.5291667,0.52917 z"
+         
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
 />
     </clipPath>
   </defs>
   <sodipodi:namedview
-     inkscape:bbox-paths="true"
-     inkscape:snap-nodes="true"
-     inkscape:snap-others="false"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox="true"
-     showguides="false"
-     inkscape:current-layer="g10"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
-     inkscape:cy="40.032949"
-     inkscape:cx="40"
-     inkscape:zoom="15.175"
-     showgrid="true"
-     id="namedview4"
-     inkscape:window-height="1377"
-     inkscape:window-width="2560"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
+     inkscape:document-rotation="0"
      pagecolor="#404040"
-     inkscape:document-rotation="0">
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="15.175"
+     inkscape:cx="40"
+     inkscape:cy="40.032949"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     showguides="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-nodes="true"
+     inkscape:bbox-paths="true">
     <inkscape:grid
-       id="grid837"
-       type="xygrid" />
+       type="xygrid"
+       id="grid837" />
   </sodipodi:namedview>
   <g
-     id="g10"
+     inkscape:groupmode="layer"
      inkscape:label="Image"
-     inkscape:groupmode="layer">
+     id="g10">
     <path
-       
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 10,64.00005 H 70 V 18.000024 c 2e-6,-4.000026 2e-6,-4.000026 
-4,-4.000026 H 14 c -4,0 -4,0 -4,4.000026 z"
-       id="path871"
+       sodipodi:nodetypes="ccccccc"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="path871"
+       d="M 10,64.00005 H 70 V 18.000024 c 2e-6,-4.000026 2e-6,-4.000026 
-4,-4.000026 H 14 c -4,0 -4,0 -4,4.000026 z"
+       
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
 />
     <path
-       
style="fill:#3399ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 8,62 V 25.999998 c 0,-6 0,-6 6,-6 h 34 c 6,0 0,-6 6,-6 h 12 c 6,0 
6,0 6,6 V 62 c 0,6 0,6 -6,6 H 14 C 8,68 8,68 8,62 Z"
-       id="path869"
+       transform="matrix(7.5590552,0,0,7.5590552,-2e-7,-2169.0394)"
+       clip-path="url(#clipPath922-6)"
+       
style="fill:#000000;fill-opacity:0.22;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 0.79374997,294.88333 v -4.7625 c 0,-0.79375 0,-0.79375 
0.79375003,-0.79375 h 4.2333333 c 0.7937501,0 10e-8,-1.05833 0.79375,-1.05833 h 
1.8520833 c 0.7937501,0 0.7937501,0.26458 0.79375,1.05833 l 1e-7,5.55625 c 
0,0.79375 0,0.79375 -0.79375,0.79375 H 1.5875 c -0.79375003,0 -0.79375003,0 
-0.79375003,-0.79375 z"
+       id="path905"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccccccccc" />
     <path
-       sodipodi:nodetypes="ccccccccccc"
-       inkscape:connector-curvature="0"
-       id="path905"
-       d="m 0.79374997,294.88333 v -4.7625 c 0,-0.79375 0,-0.79375 
0.79375003,-0.79375 h 4.2333333 c 0.7937501,0 10e-8,-1.05833 0.79375,-1.05833 h 
1.8520833 c 0.7937501,0 0.7937501,0.26458 0.79375,1.05833 l 1e-7,5.55625 c 
0,0.79375 0,0.79375 -0.79375,0.79375 H 1.5875 c -0.79375003,0 -0.79375003,0 
-0.79375003,-0.79375 z"
-       
style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       clip-path="url(#clipPath922-6)"
-       transform="matrix(7.5590552,0,0,7.5590552,-2e-7,-2169.0394)" />
-    <path
-       sodipodi:nodetypes="ccccccccccc"
-       inkscape:connector-curvature="0"
-       id="path907"
+       
style="fill:#fff078;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="M 8,62 V 25.999998 c 0,-6 0,-6 6,-6 h 32 c 8,0 0,-7.999974 
8,-7.999974 h 12 c 6,0 6,0 6,6 V 62 c 0,6 0,6 -6,6 H 14 C 8,68 8,68 8,62 Z"
-       
style="fill:#fff078;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
 />
+       id="path907"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccc" />
     <rect
-       
style="opacity:1;fill:#000000;fill-opacity:0.12549;stroke:none;stroke-width:7.55906;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect919"
-       width="63.999996"
-       height="1.9999999"
+       y="60"
        x="8"
-       y="60" />
+       height="1.9999999"
+       width="63.999996"
+       id="rect919"
+       
style="opacity:1;fill:#000000;fill-opacity:0.12549;stroke:none;stroke-width:7.55906;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
   </g>
 </svg>
diff --git a/data/elementary/themes/img/ic/efm-c-040.png 
b/data/elementary/themes/img/ic/efm-c-040.png
new file mode 100644
index 0000000000..41a4e97c24
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-c-040.png differ
diff --git a/data/elementary/themes/img/ic/efm-c-080.png 
b/data/elementary/themes/img/ic/efm-c-080.png
new file mode 100644
index 0000000000..c720a5e832
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-c-080.png differ
diff --git a/data/elementary/themes/img/ic/efm-c-160.png 
b/data/elementary/themes/img/ic/efm-c-160.png
new file mode 100644
index 0000000000..ea50bd28ee
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-c-160.png differ
diff --git a/data/elementary/themes/img/ic/efm-cpp-040.png 
b/data/elementary/themes/img/ic/efm-cpp-040.png
new file mode 100644
index 0000000000..d3bc5c0695
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-cpp-040.png 
differ
diff --git a/data/elementary/themes/img/ic/efm-cpp-080.png 
b/data/elementary/themes/img/ic/efm-cpp-080.png
new file mode 100644
index 0000000000..6895343449
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-cpp-080.png 
differ
diff --git a/data/elementary/themes/img/ic/efm-cpp-160.png 
b/data/elementary/themes/img/ic/efm-cpp-160.png
new file mode 100644
index 0000000000..e077569bb8
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-cpp-160.png 
differ
diff --git a/data/elementary/themes/img/ic/efm-device-block-040.png 
b/data/elementary/themes/img/ic/efm-device-block-040.png
new file mode 100644
index 0000000000..c2e857bf57
Binary files /dev/null and 
b/data/elementary/themes/img/ic/efm-device-block-040.png differ
diff --git a/data/elementary/themes/img/ic/efm-device-block-080.png 
b/data/elementary/themes/img/ic/efm-device-block-080.png
new file mode 100644
index 0000000000..0178623dfd
Binary files /dev/null and 
b/data/elementary/themes/img/ic/efm-device-block-080.png differ
diff --git a/data/elementary/themes/img/ic/efm-device-block-160.png 
b/data/elementary/themes/img/ic/efm-device-block-160.png
new file mode 100644
index 0000000000..4141245508
Binary files /dev/null and 
b/data/elementary/themes/img/ic/efm-device-block-160.png differ
diff --git a/data/elementary/themes/img/ic/efm-device-char-040.png 
b/data/elementary/themes/img/ic/efm-device-char-040.png
new file mode 100644
index 0000000000..0414eb5942
Binary files /dev/null and 
b/data/elementary/themes/img/ic/efm-device-char-040.png differ
diff --git a/data/elementary/themes/img/ic/efm-device-char-080.png 
b/data/elementary/themes/img/ic/efm-device-char-080.png
new file mode 100644
index 0000000000..7d14745a48
Binary files /dev/null and 
b/data/elementary/themes/img/ic/efm-device-char-080.png differ
diff --git a/data/elementary/themes/img/ic/efm-device-char-160.png 
b/data/elementary/themes/img/ic/efm-device-char-160.png
new file mode 100644
index 0000000000..bc25cc0914
Binary files /dev/null and 
b/data/elementary/themes/img/ic/efm-device-char-160.png differ
diff --git a/data/elementary/themes/img/ic/efm-device-pipe-040.png 
b/data/elementary/themes/img/ic/efm-device-pipe-040.png
new file mode 100644
index 0000000000..8a969d304c
Binary files /dev/null and 
b/data/elementary/themes/img/ic/efm-device-pipe-040.png differ
diff --git a/data/elementary/themes/img/ic/efm-device-pipe-080.png 
b/data/elementary/themes/img/ic/efm-device-pipe-080.png
new file mode 100644
index 0000000000..1e88243727
Binary files /dev/null and 
b/data/elementary/themes/img/ic/efm-device-pipe-080.png differ
diff --git a/data/elementary/themes/img/ic/efm-device-pipe-160.png 
b/data/elementary/themes/img/ic/efm-device-pipe-160.png
new file mode 100644
index 0000000000..4241a55dfa
Binary files /dev/null and 
b/data/elementary/themes/img/ic/efm-device-pipe-160.png differ
diff --git a/data/elementary/themes/img/ic/efm-device-socket-040.png 
b/data/elementary/themes/img/ic/efm-device-socket-040.png
new file mode 100644
index 0000000000..ae768de82e
Binary files /dev/null and 
b/data/elementary/themes/img/ic/efm-device-socket-040.png differ
diff --git a/data/elementary/themes/img/ic/efm-device-socket-080.png 
b/data/elementary/themes/img/ic/efm-device-socket-080.png
new file mode 100644
index 0000000000..655b71ec47
Binary files /dev/null and 
b/data/elementary/themes/img/ic/efm-device-socket-080.png differ
diff --git a/data/elementary/themes/img/ic/efm-device-socket-160.png 
b/data/elementary/themes/img/ic/efm-device-socket-160.png
new file mode 100644
index 0000000000..393a6ea61a
Binary files /dev/null and 
b/data/elementary/themes/img/ic/efm-device-socket-160.png differ
diff --git a/data/elementary/themes/img/ic/efm-file2-040.png 
b/data/elementary/themes/img/ic/efm-file2-040.png
new file mode 100644
index 0000000000..0538f6b122
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-file2-040.png 
differ
diff --git a/data/elementary/themes/img/ic/efm-file2-080.png 
b/data/elementary/themes/img/ic/efm-file2-080.png
new file mode 100644
index 0000000000..9d896f5e30
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-file2-080.png 
differ
diff --git a/data/elementary/themes/img/ic/efm-file2-160.png 
b/data/elementary/themes/img/ic/efm-file2-160.png
new file mode 100644
index 0000000000..98e116fa38
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-file2-160.png 
differ
diff --git a/data/elementary/themes/img/ic/efm-folder-040.png 
b/data/elementary/themes/img/ic/efm-folder-040.png
index 40250d17f9..fc4acb1c32 100644
Binary files a/data/elementary/themes/img/ic/efm-folder-040.png and 
b/data/elementary/themes/img/ic/efm-folder-040.png differ
diff --git a/data/elementary/themes/img/ic/efm-folder-080.png 
b/data/elementary/themes/img/ic/efm-folder-080.png
index fd6330940a..ba4f8669ce 100644
Binary files a/data/elementary/themes/img/ic/efm-folder-080.png and 
b/data/elementary/themes/img/ic/efm-folder-080.png differ
diff --git a/data/elementary/themes/img/ic/efm-folder-160.png 
b/data/elementary/themes/img/ic/efm-folder-160.png
index 47b11675f1..7aed8bbc2b 100644
Binary files a/data/elementary/themes/img/ic/efm-folder-160.png and 
b/data/elementary/themes/img/ic/efm-folder-160.png differ
diff --git a/data/elementary/themes/img/ic/efm-folder-locked-040.png 
b/data/elementary/themes/img/ic/efm-folder-locked-040.png
new file mode 100644
index 0000000000..e039cf749b
Binary files /dev/null and 
b/data/elementary/themes/img/ic/efm-folder-locked-040.png differ
diff --git a/data/elementary/themes/img/ic/efm-folder-locked-080.png 
b/data/elementary/themes/img/ic/efm-folder-locked-080.png
new file mode 100644
index 0000000000..ebeb04d416
Binary files /dev/null and 
b/data/elementary/themes/img/ic/efm-folder-locked-080.png differ
diff --git a/data/elementary/themes/img/ic/efm-folder-locked-160.png 
b/data/elementary/themes/img/ic/efm-folder-locked-160.png
new file mode 100644
index 0000000000..8fa41fa9e0
Binary files /dev/null and 
b/data/elementary/themes/img/ic/efm-folder-locked-160.png differ
diff --git a/data/elementary/themes/img/ic/efm-h-040.png 
b/data/elementary/themes/img/ic/efm-h-040.png
new file mode 100644
index 0000000000..f4badb2ca5
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-h-040.png differ
diff --git a/data/elementary/themes/img/ic/efm-h-080.png 
b/data/elementary/themes/img/ic/efm-h-080.png
new file mode 100644
index 0000000000..5306a8a924
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-h-080.png differ
diff --git a/data/elementary/themes/img/ic/efm-h-160.png 
b/data/elementary/themes/img/ic/efm-h-160.png
new file mode 100644
index 0000000000..cc09c34f8a
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-h-160.png differ
diff --git a/data/elementary/themes/img/ic/efm-hpp-040.png 
b/data/elementary/themes/img/ic/efm-hpp-040.png
new file mode 100644
index 0000000000..ef41f9615a
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-hpp-040.png 
differ
diff --git a/data/elementary/themes/img/ic/efm-hpp-080.png 
b/data/elementary/themes/img/ic/efm-hpp-080.png
new file mode 100644
index 0000000000..eefc01cc57
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-hpp-080.png 
differ
diff --git a/data/elementary/themes/img/ic/efm-hpp-160.png 
b/data/elementary/themes/img/ic/efm-hpp-160.png
new file mode 100644
index 0000000000..de67c0aa66
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-hpp-160.png 
differ
diff --git a/data/elementary/themes/img/ic/efm-sh-040.png 
b/data/elementary/themes/img/ic/efm-sh-040.png
new file mode 100644
index 0000000000..e985b87952
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-sh-040.png differ
diff --git a/data/elementary/themes/img/ic/efm-sh-080.png 
b/data/elementary/themes/img/ic/efm-sh-080.png
new file mode 100644
index 0000000000..c5b627e155
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-sh-080.png differ
diff --git a/data/elementary/themes/img/ic/efm-sh-160.png 
b/data/elementary/themes/img/ic/efm-sh-160.png
new file mode 100644
index 0000000000..be49c98230
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-sh-160.png differ
diff --git a/data/elementary/themes/img/ic/efm-symlink-040.png 
b/data/elementary/themes/img/ic/efm-symlink-040.png
new file mode 100644
index 0000000000..1e90e3e73d
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-symlink-040.png 
differ
diff --git a/data/elementary/themes/img/ic/efm-symlink-080.png 
b/data/elementary/themes/img/ic/efm-symlink-080.png
new file mode 100644
index 0000000000..f53332355e
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-symlink-080.png 
differ
diff --git a/data/elementary/themes/img/ic/efm-symlink-160.png 
b/data/elementary/themes/img/ic/efm-symlink-160.png
new file mode 100644
index 0000000000..3e3546706c
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-symlink-160.png 
differ
diff --git a/data/elementary/themes/img/ic/efm-txt-040.png 
b/data/elementary/themes/img/ic/efm-txt-040.png
new file mode 100644
index 0000000000..38ca8098ff
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-txt-040.png 
differ
diff --git a/data/elementary/themes/img/ic/efm-txt-080.png 
b/data/elementary/themes/img/ic/efm-txt-080.png
new file mode 100644
index 0000000000..edf981bd00
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-txt-080.png 
differ
diff --git a/data/elementary/themes/img/ic/efm-txt-160.png 
b/data/elementary/themes/img/ic/efm-txt-160.png
new file mode 100644
index 0000000000..aac8810536
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-txt-160.png 
differ
diff --git a/data/elementary/themes/img/symlink.svg 
b/data/elementary/themes/img/symlink.svg
new file mode 100644
index 0000000000..376c174f66
--- /dev/null
+++ b/data/elementary/themes/img/symlink.svg
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   version="1.1"
+   id="svg2"
+   width="80"
+   height="80"
+   viewBox="0 0 80 80"
+   sodipodi:docname="symlink.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   
inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/efm-symlink-040.png"
+   inkscape:export-xdpi="48"
+   inkscape:export-ydpi="48">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect878" />
+    <rect
+       x="20"
+       y="50"
+       width="40"
+       height="30"
+       id="rect872" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect864" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect858" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect852" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#404040"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="15.175"
+     inkscape:cx="45.271829"
+     inkscape:cy="40"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     showguides="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-nodes="true"
+     borderlayer="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid837" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <path
+       
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.55;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 29,25 V 55 H 4 V 35 L 14,25 Z"
+       id="path27896" />
+    <rect
+       
style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.635085;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect28078"
+       width="10"
+       height="2"
+       x="8"
+       y="36" />
+    <rect
+       y="40"
+       x="8"
+       height="2"
+       width="15"
+       id="rect28080"
+       
style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.777817;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <rect
+       
style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.695703;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect28082"
+       width="12"
+       height="2"
+       x="8"
+       y="44" />
+    <rect
+       y="48"
+       x="8"
+       height="2"
+       width="17"
+       id="rect28084"
+       
style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.828053;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <path
+       id="path27896-3"
+       d="M 76,25 V 55 H 51 V 35 L 61,25 Z"
+       
style="opacity:1;fill:#a0a0a0;fill-opacity:1;stroke:none;stroke-width:0.55;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <path
+       sodipodi:nodetypes="ccccccc"
+       id="path7785"
+       d="m 47,40 -10,-10 -4,4 6,6 -6,6 4,4 z"
+       
style="fill:#ffffff;fill-opacity:1;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
 />
+    <rect
+       y="36"
+       x="55"
+       height="2"
+       width="10"
+       id="rect7787"
+       
style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.635085;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <rect
+       
style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.777817;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect7789"
+       width="15"
+       height="2"
+       x="55"
+       y="40" />
+    <rect
+       y="44"
+       x="55"
+       height="2"
+       width="12"
+       id="rect7791"
+       
style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.695703;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <rect
+       
style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.828053;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect7793"
+       width="17"
+       height="2"
+       x="55"
+       y="48" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path27900-6"
+       d="M 51,35 62,37.5 61,25 Z"
+       
style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.55;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <path
+       id="path27898-7"
+       d="M 51,35 H 61 V 25 Z"
+       
style="opacity:1;fill:#c8c8c8;fill-opacity:1;stroke:none;stroke-width:0.55;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <path
+       
style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.55;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 4,35 15,37.5 14,25 Z"
+       id="path27900"
+       sodipodi:nodetypes="cccc" />
+    <path
+       
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.55;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 4,35 H 14 V 25 Z"
+       id="path27898" />
+  </g>
+</svg>

-- 


Reply via email to