Update js lib versions (#305)

* Adds rule improvements for Android Intents, IOS permissions, UWP capability declarations. * Updates to new rules, pattern aggregation and description updates. Fix for endLocationLine if match is on last line of the file. Minor wording improvements on html report. * Tag and description updates * Updates popper lib version. D3 cannot be updated as it breaks existing functionality. D3 ref is kept but copy is added to code for safekeeping. * #262, #303 fixes. Also orders feature groups more alphabetically. * Identified ref for 3 js libs allowing removal of local copies.
2020-09-29 20:43:03 -06:00 · 2020-09-29 20:43:03 -06:00 · 275dbc0449
--- a/AppInspector.CLI/AppInspector.CLI.csproj
+++ b/AppInspector.CLI/AppInspector.CLI.csproj
@ -52,15 +52,6 @@
    </None>
   <None Update="html\resources\js\appinspector.js">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="html\resources\js\ext-beautify.js">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="html\resources\js\ext-modelist.js">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="html\resources\js\ext-settings_menu.js">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
      <None Update="preferences\tagreportgroups.json">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
--- a/AppInspector.CLI/html/index.html
+++ b/AppInspector.CLI/html/index.html
@ -4,7 +4,7 @@
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.5.2/css/bootstrap.min.css" />
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.14.0/css/all.min.css" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.0/css/all.min.css" />
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/c3/0.7.20/c3.css" />
    <link rel="stylesheet" type="text/css" href="html/resources/css/appinspector.css" />

@ -56,7 +56,10 @@
    <script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.5.2/js/bootstrap.min.js" integrity="sha512-M5KW3ztuIICmVIhjSqXe01oV2bpe248gOxqmlcYrEzAvws7Pw3z6BK0iGbrwvdrUQUhi3eXgtxp5I8PDo9YfjQ==" crossorigin="anonymous"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/c3/0.7.20/c3.min.js" integrity="sha512-+IpCthlNahOuERYUSnKFjzjdKXIbJ/7Dd6xvUp+7bEw0Jp2dg6tluyxLs+zq9BMzZgrLv8886T4cBSqnKiVgUw==" crossorigin="anonymous"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/d3/5.16.0/d3.min.js" integrity="sha512-FHsFVKQ/T1KWJDGSbrUhTJyS1ph3eRrxI228ND0EGaEp6v4a/vGwPWd3Dtd/+9cI7ccofZvl/wulICEurHN1pg==" crossorigin="anonymous"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/2.4.4/umd/popper.min.js" integrity="sha512-eUQ9hGdLjBjY3F41CScH3UX+4JDSI9zXeroz7hJ+RteoCaY+GP/LDoM8AO+Pt+DRFw3nXqsjh9Zsts8hnYv8/A==" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/2.5.3/umd/popper.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.3.3/ext-beautify.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.3.3/ext-modelist.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.3.3/ext-settings_menu.js"></script>

    <script type="text/javascript">
        let data = {{ json }};
--- a/AppInspector.CLI/html/partials/_report_profile.liquid
+++ b/AppInspector.CLI/html/partials/_report_profile.liquid
@ -5,7 +5,7 @@
    View key characteristics organized by Feature Groups. <b>Click any active icon</b> below or expand a feature group to view 
    additional details. A disabled icon indicates a 'not found' status.  Click a Rule name on the right to view 
    where a specific feature was found in code.  The <b>full set</b> of identified features can be found under the Summary menu.
-    To see all <i>occurences</i> of each feature, choose a different report format.
+    To see all <i>occurences</i> of each feature, choose a different report format and use the -d option.
  </div>
 </div>
 <br>
--- a/AppInspector.CLI/html/resources/js/d3.min.js
+++ b/AppInspector.CLI/html/resources/js/d3.min.js
--- a/AppInspector.CLI/html/resources/js/ext-beautify.js
+++ b/AppInspector.CLI/html/resources/js/ext-beautify.js
@ -1,7 +0,0 @@
-define("ace/ext/beautify",["require","exports","module","ace/token_iterator"],function(e,t,n){"use strict";function i(e,t){return e.type.lastIndexOf(t+".xml")>-1}var r=e("../token_iterator").TokenIterator;t.singletonTags=["area","base","br","col","command","embed","hr","html","img","input","keygen","link","meta","param","source","track","wbr"],t.blockTags=["article","aside","blockquote","body","div","dl","fieldset","footer","form","head","header","html","nav","ol","p","script","section","style","table","tbody","tfoot","thead","ul"],t.beautify=function(e){var n=new r(e,0,0),s=n.getCurrentToken(),o=e.getTabString(),u=t.singletonTags,a=t.blockTags,f,l=!1,c=!1,h=!1,p="",d="",v="",m=0,g=0,y=0,b=0,w=0,E=0,S=0,x,T=0,N=0,C=[],k=!1,L,A=!1,O=!1,M=!1,_=!1,D={0:0},P=[],H=function(){f&&f.value&&f.type!=="string.regexp"&&(f.value=f.value.trim())},B=function(){p=p.replace(/ +$/,"")},j=function(){p=p.trimRight(),l=!1};while(s!==null){T=n.getCurrentTokenRow(),C=n.$rowTokens,f=n.stepForward();if(typeof s!="undefined"){d=s.value,w=0,M=v==="style"||e.$modeId==="ace/mode/css",i(s,"tag-open")?(O=!0,f&&(_=a.indexOf(f.value)!==-1),d==="</"&&(_&&!l&&N<1&&N++,M&&(N=1),w=1,_=!1)):i(s,"tag-close")?O=!1:i(s,"comment.start")?_=!0:i(s,"comment.end")&&(_=!1),!O&&!N&&s.type==="paren.rparen"&&s.value.substr(0,1)==="}"&&N++,T!==x&&(N=T,x&&(N-=x));if(N){j();for(;N>0;N--)p+="\n";l=!0,!i(s,"comment")&&!s.type.match(/^(comment|string)$/)&&(d=d.trimLeft())}if(d){s.type==="keyword"&&d.match(/^(if|else|elseif|for|foreach|while|switch)$/)?(P[m]=d,H(),h=!0,d.match(/^(else|elseif)$/)&&p.match(/\}[\s]*$/)&&(j(),c=!0)):s.type==="paren.lparen"?(H(),d.substr(-1)==="{"&&(h=!0,A=!1,O||(N=1)),d.substr(0,1)==="{"&&(c=!0,p.substr(-1)!=="["&&p.trimRight().substr(-1)==="["?(j(),c=!1):p.trimRight().substr(-1)===")"?j():B())):s.type==="paren.rparen"?(w=1,d.substr(0,1)==="}"&&(P[m-1]==="case"&&w++,p.trimRight().substr(-1)==="{"?j():(c=!0,M&&(N+=2))),d.substr(0,1)==="]"&&p.substr(-1)!=="}"&&p.trimRight().substr(-1)==="}"&&(c=!1,b++,j()),d.substr(0,1)===")"&&p.substr(-1)!=="("&&p.trimRight().substr(-1)==="("&&(c=!1,b++,j()),B()):s.type!=="keyword.operator"&&s.type!=="keyword"||!d.match(/^(=|==|===|!=|!==|&&|\|\||and|or|xor|\+=|.=|>|>=|<|<=|=>)$/)?s.type==="punctuation.operator"&&d===";"?(j(),H(),h=!0,M&&N++):s.type==="punctuation.operator"&&d.match(/^(:|,)$/)?(j(),H(),d.match(/^(,)$/)&&S>0&&E===0?N++:(h=!0,l=!1)):s.type==="support.php_tag"&&d==="?>"&&!l?(j(),c=!0):i(s,"attribute-name")&&p.substr(-1).match(/^\s$/)?c=!0:i(s,"attribute-equals")?(B(),H()):i(s,"tag-close")&&(B(),d==="/>"&&(c=!0)):(j(),H(),c=!0,h=!0);if(l&&(!s.type.match(/^(comment)$/)||!!d.substr(0,1).match(/^[/#]$/))&&(!s.type.match(/^(string)$/)||!!d.substr(0,1).match(/^['"]$/))){b=y;if(m>g){b++;for(L=m;L>g;L--)D[L]=b}else m<g&&(b=D[m]);g=m,y=b,w&&(b-=w),A&&!E&&(b++,A=!1);for(L=0;L<b;L++)p+=o}s.type==="keyword"&&d.match(/^(case|default)$/)&&(P[m]=d,m++),s.type==="keyword"&&d.match(/^(break)$/)&&P[m-1]&&P[m-1].match(/^(case|default)$/)&&m--,s.type==="paren.lparen"&&(E+=(d.match(/\(/g)||[]).length,S+=(d.match(/\{/g)||[]).length,m+=d.length),s.type==="keyword"&&d.match(/^(if|else|elseif|for|while)$/)?(A=!0,E=0):!E&&d.trim()&&s.type!=="comment"&&(A=!1);if(s.type==="paren.rparen"){E-=(d.match(/\)/g)||[]).length,S-=(d.match(/\}/g)||[]).length;for(L=0;L<d.length;L++)m--,d.substr(L,1)==="}"&&P[m]==="case"&&m--}c&&!l&&(B(),p.substr(-1)!=="\n"&&(p+=" ")),p+=d,h&&(p+=" "),l=!1,c=!1,h=!1;if(i(s,"tag-close")&&(_||a.indexOf(v)!==-1)||i(s,"doctype")&&d===">")_&&f&&f.value==="</"?N=-1:N=1;i(s,"tag-open")&&d==="</"?m--:i(s,"tag-open")&&d==="<"&&u.indexOf(f.value)===-1?m++:i(s,"tag-name")?v=d:i(s,"tag-close")&&d==="/>"&&u.indexOf(v)===-1&&m--,x=T}}s=f}p=p.trim(),e.doc.setValue(p)},t.commands=[{name:"beautify",description:"Format selection (Beautify)",exec:function(e){t.beautify(e.session)},bindKey:"Ctrl-Shift-B"}]});                (function() {
-                    window.require(["ace/ext/beautify"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
--- a/AppInspector.CLI/html/resources/js/ext-modelist.js
+++ b/AppInspector.CLI/html/resources/js/ext-modelist.js
@ -1,7 +0,0 @@
-define("ace/ext/modelist",["require","exports","module"],function(e,t,n){"use strict";function i(e){var t=a.text,n=e.split(/[\/\\]/).pop();for(var i=0;i<r.length;i++)if(r[i].supportsFile(n)){t=r[i];break}return t}var r=[],s=function(e,t,n){this.name=e,this.caption=t,this.mode="ace/mode/"+e,this.extensions=n;var r;/\^/.test(n)?r=n.replace(/\|(\^)?/g,function(e,t){return"$|"+(t?"^":"^.*\\.")})+"$":r="^.*\\.("+n+")$",this.extRe=new RegExp(r,"gi")};s.prototype.supportsFile=function(e){return e.match(this.extRe)};var o={ABAP:["abap"],ABC:["abc"],ActionScript:["as"],ADA:["ada|adb"],Apache_Conf:["^htaccess|^htgroups|^htpasswd|^conf|htaccess|htgroups|htpasswd"],AsciiDoc:["asciidoc|adoc"],ASL:["dsl|asl"],Assembly_x86:["asm|a"],AutoHotKey:["ahk"],Apex:["apex|cls|trigger|tgr"],AQL:["aql"],BatchFile:["bat|cmd"],C_Cpp:["cpp|c|cc|cxx|h|hh|hpp|ino"],C9Search:["c9search_results"],Crystal:["cr"],Cirru:["cirru|cr"],Clojure:["clj|cljs"],Cobol:["CBL|COB"],coffee:["coffee|cf|cson|^Cakefile"],ColdFusion:["cfm"],CSharp:["cs"],Csound_Document:["csd"],Csound_Orchestra:["orc"],Csound_Score:["sco"],CSS:["css"],Curly:["curly"],D:["d|di"],Dart:["dart"],Diff:["diff|patch"],Dockerfile:["^Dockerfile"],Dot:["dot"],Drools:["drl"],Edifact:["edi"],Eiffel:["e|ge"],EJS:["ejs"],Elixir:["ex|exs"],Elm:["elm"],Erlang:["erl|hrl"],Forth:["frt|fs|ldr|fth|4th"],Fortran:["f|f90"],FSharp:["fsi|fs|ml|mli|fsx|fsscript"],FSL:["fsl"],FTL:["ftl"],Gcode:["gcode"],Gherkin:["feature"],Gitignore:["^.gitignore"],Glsl:["glsl|frag|vert"],Gobstones:["gbs"],golang:["go"],GraphQLSchema:["gql"],Groovy:["groovy"],HAML:["haml"],Handlebars:["hbs|handlebars|tpl|mustache"],Haskell:["hs"],Haskell_Cabal:["cabal"],haXe:["hx"],Hjson:["hjson"],HTML:["html|htm|xhtml|vue|we|wpy"],HTML_Elixir:["eex|html.eex"],HTML_Ruby:["erb|rhtml|html.erb"],INI:["ini|conf|cfg|prefs"],Io:["io"],Jack:["jack"],Jade:["jade|pug"],Java:["java"],JavaScript:["js|jsm|jsx"],JSON:["json"],JSONiq:["jq"],JSP:["jsp"],JSSM:["jssm|jssm_state"],JSX:["jsx"],Julia:["jl"],Kotlin:["kt|kts"],LaTeX:["tex|latex|ltx|bib"],LESS:["less"],Liquid:["liquid"],Lisp:["lisp"],LiveScript:["ls"],LogiQL:["logic|lql"],LSL:["lsl"],Lua:["lua"],LuaPage:["lp"],Lucene:["lucene"],Makefile:["^Makefile|^GNUmakefile|^makefile|^OCamlMakefile|make"],Markdown:["md|markdown"],Mask:["mask"],MATLAB:["matlab"],Maze:["mz"],MEL:["mel"],MIXAL:["mixal"],MUSHCode:["mc|mush"],MySQL:["mysql"],Nginx:["nginx|conf"],Nix:["nix"],Nim:["nim"],NSIS:["nsi|nsh"],ObjectiveC:["m|mm"],OCaml:["ml|mli"],Pascal:["pas|p"],Perl:["pl|pm"],Perl6:["p6|pl6|pm6"],pgSQL:["pgsql"],PHP_Laravel_blade:["blade.php"],PHP:["php|inc|phtml|shtml|php3|php4|php5|phps|phpt|aw|ctp|module"],Puppet:["epp|pp"],Pig:["pig"],Powershell:["ps1"],Praat:["praat|praatscript|psc|proc"],Prolog:["plg|prolog"],Properties:["properties"],Protobuf:["proto"],Python:["py"],R:["r"],Razor:["cshtml|asp"],RDoc:["Rd"],Red:["red|reds"],RHTML:["Rhtml"],RST:["rst"],Ruby:["rb|ru|gemspec|rake|^Guardfile|^Rakefile|^Gemfile"],Rust:["rs"],SASS:["sass"],SCAD:["scad"],Scala:["scala|sbt"],Scheme:["scm|sm|rkt|oak|scheme"],SCSS:["scss"],SH:["sh|bash|^.bashrc"],SJS:["sjs"],Slim:["slim|skim"],Smarty:["smarty|tpl"],snippets:["snippets"],Soy_Template:["soy"],Space:["space"],SQL:["sql"],SQLServer:["sqlserver"],Stylus:["styl|stylus"],SVG:["svg"],Swift:["swift"],Tcl:["tcl"],Terraform:["tf","tfvars","terragrunt"],Tex:["tex"],Text:["txt"],Textile:["textile"],Toml:["toml"],TSX:["tsx"],Twig:["latte|twig|swig"],Typescript:["ts|typescript|str"],Vala:["vala"],VBScript:["vbs|vb"],Velocity:["vm"],Verilog:["v|vh|sv|svh"],VHDL:["vhd|vhdl"],Visualforce:["vfp|component|page"],Wollok:["wlk|wpgm|wtest"],XML:["xml|rdf|rss|wsdl|xslt|atom|mathml|mml|xul|xbl|xaml"],XQuery:["xq"],YAML:["yaml|yml"],Zeek:["zeek|bro"],Django:["html"]},u={ObjectiveC:"Objective-C",CSharp:"C#",golang:"Go",C_Cpp:"C and C++",Csound_Document:"Csound Document",Csound_Orchestra:"Csound",Csound_Score:"Csound Score",coffee:"CoffeeScript",HTML_Ruby:"HTML (Ruby)",HTML_Elixir:"HTML (Elixir)",FTL:"FreeMarker",PHP_Laravel_blade:"PHP (Blade Template)",Perl6:"Perl 6",AutoHotKey:"AutoHotkey / AutoIt"},a={};for(var f in o){var l=o[f],c=(u[f]||f).replace(/_/g," "),h=f.toLowerCase(),p=new s(h,c,l[0]);a[h]=p,r.push(p)}n.exports={getModeForPath:i,modes:r,modesByName:a}});                (function() {
-                    window.require(["ace/ext/modelist"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
--- a/AppInspector.CLI/html/resources/js/ext-settings_menu.js
+++ b/AppInspector.CLI/html/resources/js/ext-settings_menu.js
--- a/AppInspector.CLI/preferences/tagreportgroups.json
+++ b/AppInspector.CLI/preferences/tagreportgroups.json
@ -6,7 +6,7 @@
    "type": "uniqueTags",
    "groups": [
      {
-        "title": "Select Features",
+        "title": "<i>Select Features</i> ",
        "dataRef": "SelectFeatures",
        "patterns": [
          {
@ -26,7 +26,7 @@
          },
          {
            "searchPattern": "Deserialization",
-            "displayName": "Data deserialization",
+            "displayName": "Object deserialization",
            "detectedIcon": "far fa-object-ungroup"
          },
          {
@ -42,48 +42,120 @@
        ]
      },
      {
-        "title": "General Features",
-        "dataRef": "GeneralFeatures",
+        "title": "Active Content",
+        "dataRef": "ActiveContent",
        "patterns": [
          {
-            "searchPattern": "Network.Connection",
-            "displayName": "Network communications",
-            "detectedIcon": "fas fa-network-wired"
+            "searchPattern": ".Flash",
+            "displayName": "Adobe Flash",
+            "detectedIcon": "fas fa-bolt"
          },
          {
-            "searchPattern": "FileOperation.Read",
-            "displayName": "File read",
-            "detectedIcon": "fas fa-file"
+            "searchPattern": ".ActiveX",
+            "displayName": "Microsoft ActiveX",
+            "detectedIcon": "fas fa-file-invoice"
          },
          {
-            "searchPattern": "FileOperation.Write",
-            "displayName": "File write",
-            "detectedIcon": "far fa-edit"
+            "searchPattern": ".Microsoft.COM",
+            "displayName": "Microsoft COM",
+            "detectedIcon": "fab fa-hubspot"
          },
          {
-            "searchPattern": "FileOperation.Delete",
-            "displayName": "File delete",
-            "detectedIcon": "fas fa-trash"
+            "searchPattern": ".Silverlight",
+            "displayName": "Microsoft Silverlight",
+            "detectedIcon": "fas fa-cloud-moon"
          },
          {
-            "searchPattern": "Multiprocessing",
-            "displayName": "Multi-threaded processing",
-            "detectedIcon": "fas fa-code-branch"
+            "searchPattern": ".PDF",
+            "displayName": "Adobe PDF",
+            "detectedIcon": "far fa-file-pdf"
          },
          {
-            "searchPattern": "Logging",
-            "displayName": "Logging",
-            "detectedIcon": "far fa-clock"
+            "searchPattern": ".Ajax",
+            "displayName": "Javascript ajax",
+            "detectedIcon": "fas fa-exchange-alt"
+          }
+        ]
      },
      {
-            "searchPattern": "Data.Parsing.XML",
-            "displayName": "Processes XML",
-            "detectedIcon": "far fa-file-code"
+        "title": "Cloud Services",
+        "dataRef": "CloudServices",
+        "patterns": [
+          {
+            "searchPattern": "CloudServices.Hosting",
+            "displayName": "Hosting",
+            "detectedIcon": "fab fa-microsoft"
          },
          {
-            "searchPattern": "Data.Parsing.JSON",
-            "displayName": "Processes JSON",
-            "detectedIcon": "far fa-file-alt"
+            "searchPattern": "CloudServices.Application",
+            "displayName": "Cloud application",
+            "detectedIcon": "fas fa-globe"
+          },
+          {
+            "searchPattern": "CloudServices.DataStorage",
+            "displayName": "Cloud data storage",
+            "detectedIcon": "fas fa-cloud-upload-alt"
+          },
+          {
+            "searchPattern": "CloudServices.BigData",
+            "displayName": "Big data",
+            "detectedIcon": "fas fa-warehouse"
+          },
+          {
+            "searchPattern": "CloudServices.SocialMedia",
+            "displayName": "Social media",
+            "detectedIcon": "fab fa-facebook-square"
+          },
+          {
+            "searchPattern": "CloudServices.Finance.eCommerce",
+            "displayName": "eCommerce",
+            "detectedIcon": "fas fa-shopping-cart"
+          },
+          {
+            "searchPattern": "Web.Analytics",
+            "displayName": "Web Analytics",
+            "detectedIcon": "fas fa-flag-checkered"
+          },
+          {
+            "searchPattern": ".AdvertisingNetwork",
+            "displayName": "Advertising network",
+            "detectedIcon": "fas fa-ad"
+          }
+        ]
+      },
+      {
+        "title": "Data Storage",
+        "dataRef": "DataStorage",
+        "patterns": [
+          {
+            "searchPattern": "DBMS.SQLite",
+            "displayName": "SQLite database",
+            "detectedIcon": "fas fa-table"
+          },
+          {
+            "searchPattern": "DBMS.SQL",
+            "displayName": "SQL database",
+            "detectedIcon": "fas fa-database"
+          },
+          {
+            "searchPattern": "DBMS.NOSQL",
+            "displayName": "NOSQL database",
+            "detectedIcon": "fab fa-mdb"
+          },
+          {
+            "searchPattern": "DBMS.PostgreSQL",
+            "displayName": "PostgreSQL Database",
+            "detectedIcon": "fas fa-archive"
+          },
+          {
+            "searchPattern": "DBMS.Oracle",
+            "displayName": "Database ORM",
+            "detectedIcon": "fas fa-map"
+          },
+          {
+            "searchPattern": "DBMS.General",
+            "displayName": "General database",
+            "detectedIcon": "fas fa-save"
          }
        ]
      },
@ -134,166 +206,135 @@
        ]
      },
      {
-        "title": "Active Content",
-        "dataRef": "ActiveContent",
+        "title": "Device Permissions",
+        "dataRef": "DevicePermissions",
        "patterns": [
          {
-            "searchPattern": ".Flash",
-            "displayName": "Adobe Flash",
-            "detectedIcon": "fab fa-adobe"
+            "searchPattern": "Permissions.PhoneCalls",
+            "displayName": "Phone calls",
+            "detectedIcon": "fa fa-phone"
          },
          {
-            "searchPattern": ".ActiveX",
-            "displayName": "Microsoft ActiveX",
-            "detectedIcon": "fas fa-file-invoice"
+            "searchPattern": "Permissions.SMS",
+            "displayName": "SMS",
+            "detectedIcon": "far fa-comment"
          },
          {
-            "searchPattern": ".Microsoft.COM",
-            "displayName": "Microsoft COM",
-            "detectedIcon": "fab fa-hubspot"
+            "searchPattern": "Permissions.Email",
+            "displayName": "Email",
+            "detectedIcon": "fa fa-envelope"
          },
          {
-            "searchPattern": ".Silverlight",
-            "displayName": "Microsoft Silverlight",
-            "detectedIcon": "fas fa-bolt"
+            "searchPattern": "Permissions.CalendarEvents",
+            "displayName": "Calendar events",
+            "detectedIcon": "far fa-calendar-alt"
          },
          {
-            "searchPattern": ".PDF",
-            "displayName": "Adobe PDF",
-            "detectedIcon": "far fa-file-pdf"
+            "searchPattern": "Permissions.Camera",
+            "displayName": "Camera",
+            "detectedIcon": "fa fa-camera"
          },
          {
-            "searchPattern": ".Ajax",
-            "displayName": "Javascript ajax",
-            "detectedIcon": "fas fa-exchange-alt"
+            "searchPattern": "Permissions.MediaLibrary",
+            "displayName": "Media library",
+            "detectedIcon": "far fa-file-audio"
+          },
+          {
+            "searchPattern": "Permissions.VoiceCommand",
+            "displayName": "Voice command",
+            "detectedIcon": "fa fa-bullhorn"
+          },
+          {
+            "searchPattern": "Permissions.Microphone",
+            "displayName": "Microphone",
+            "detectedIcon": "fa fa-microphone"
          }
        ]
      },
      {
-        "title": "Data Storage",
-        "dataRef": "DataStorage",
+        "title": "General Features",
+        "dataRef": "GeneralFeatures",
        "patterns": [
          {
-            "searchPattern": "DBMS.SQLite",
-            "displayName": "SQLite database",
-            "detectedIcon": "fas fa-table"
+            "searchPattern": "Network.Connection",
+            "displayName": "Network communications",
+            "detectedIcon": "fas fa-network-wired"
          },
          {
-            "searchPattern": "DBMS.SQL",
-            "displayName": "SQL database",
-            "detectedIcon": "fas fa-database"
+            "searchPattern": "FileOperation.Read",
+            "displayName": "File read",
+            "detectedIcon": "fas fa-file"
          },
          {
-            "searchPattern": "DBMS.NOSQL",
-            "displayName": "NOSQL database",
-            "detectedIcon": "fab fa-mdb"
+            "searchPattern": "FileOperation.Write",
+            "displayName": "File write",
+            "detectedIcon": "far fa-edit"
          },
          {
-            "searchPattern": "DBMS.PostgreSQL",
-            "displayName": "PostgreSQL Database",
-            "detectedIcon": "fas fa-archive"
+            "searchPattern": "FileOperation.Delete",
+            "displayName": "File delete",
+            "detectedIcon": "fas fa-trash"
          },
          {
-            "searchPattern": "DBMS.Oracle",
-            "displayName": "Database ORM",
-            "detectedIcon": "fas fa-map"
+            "searchPattern": "Multiprocessing",
+            "displayName": "Multi-threaded processing",
+            "detectedIcon": "fas fa-code-branch"
          },
          {
-            "searchPattern": "DBMS.General",
-            "displayName": "General database",
-            "detectedIcon": "fas fa-save"
+            "searchPattern": "Logging",
+            "displayName": "Logging",
+            "detectedIcon": "far fa-clock"
+          },
+          {
+            "searchPattern": "Data.Parsing.XML",
+            "displayName": "Processes XML",
+            "detectedIcon": "far fa-file-code"
+          },
+          {
+            "searchPattern": "Data.Parsing.JSON",
+            "displayName": "Processes JSON",
+            "detectedIcon": "far fa-file-alt"
          }
        ]
      },
      {
-        "title": "Sensitive Data",
-        "dataRef": "SensitiveData",
+        "title": "Miscellenous",
+        "dataRef": "Miscellenous",
        "patterns": [
          {
-            "searchPattern": "Sensitive.Identification",
-            "displayName": "Personally identifiable data",
-            "detectedIcon": "far fa-address-card"
+            "searchPattern": "Data.Media",
+            "displayName": "AV media",
+            "detectedIcon": "fas fa-play-circle"
          },
          {
-            "searchPattern": "Sensitive.Medical",
-            "displayName": "Medical data",
-            "detectedIcon": "fas fa-stethoscope"
+            "searchPattern": "Data.Zipfile",
+            "displayName": "Zip file processing",
+            "detectedIcon": "far fa-file-archive"
          },
          {
-            "searchPattern": "Sensitive.Credentials",
-            "displayName": "Credentials",
-            "detectedIcon": "fas fa-user-secret"
+            "searchPattern": "HTMLForm.Defined",
+            "displayName": "HTML form",
+            "detectedIcon": "far fa-window-maximize"
          },
          {
-            "searchPattern": "Sensitive.UserAccount",
-            "displayName": "Account or membership",
-            "detectedIcon": "fas fa-user-circle"
+            "searchPattern": "Exception.Caught",
+            "displayName": "Exception caught",
+            "detectedIcon": "fas fa-meteor"
          },
          {
-            "searchPattern": "Sensitive.ProductKey",
-            "displayName": "Product key",
-            "detectedIcon": "fas fa-compact-disc"
+            "searchPattern": "Hardware",
+            "displayName": "Specialized hardware",
+            "detectedIcon": "far fa-keyboard"
          },
          {
-            "searchPattern": "CryptoCurrency",
-            "displayName": "Crypto currency",
-            "detectedIcon": "fab fa-bitcoin"
+            "searchPattern": "Comment.Fix",
+            "displayName": "Fix comments",
+            "detectedIcon": "fas fa-toolbox"
          },
          {
-            "searchPattern": "Sensitive.Secret",
-            "displayName": "Senstive secret",
-            "detectedIcon": "fab fa-keycdn"
-          },
-          {
-            "searchPattern": "Sensitive.Financial",
-            "displayName": "Financial data",
-            "detectedIcon": "fas fa-money-bill"
-          }
-        ]
-      },
-      {
-        "title": "Cloud Services",
-        "dataRef": "CloudServices",
-        "patterns": [
-          {
-            "searchPattern": "CloudServices.Hosting",
-            "displayName": "Hosting",
-            "detectedIcon": "fab fa-microsoft"
-          },
-          {
-            "searchPattern": "CloudServices.Application",
-            "displayName": "Cloud application",
-            "detectedIcon": "fas fa-globe"
-          },
-          {
-            "searchPattern": "CloudServices.DataStorage",
-            "displayName": "Cloud data storage",
-            "detectedIcon": "fas fa-cloud-upload-alt"
-          },
-          {
-            "searchPattern": "CloudServices.BigData",
-            "displayName": "Big data",
-            "detectedIcon": "fas fa-warehouse"
-          },
-          {
-            "searchPattern": "CloudServices.SocialMedia",
-            "displayName": "Social media",
-            "detectedIcon": "fab fa-facebook-square"
-          },
-          {
-            "searchPattern": "CloudServices.Finance.eCommerce",
-            "displayName": "eCommerce",
-            "detectedIcon": "fas fa-shopping-cart"
-          },
-          {
-            "searchPattern": "Web.Analytics",
-            "displayName": "Web Analytics",
-            "detectedIcon": "fas fa-flag-checkered"
-          },
-          {
-            "searchPattern": ".AdvertisingNetwork",
-            "displayName": "Advertising network",
-            "detectedIcon": "fas fa-ad"
+            "searchPattern": "Comment.Suspicious",
+            "displayName": "Suspicious comments",
+            "detectedIcon": "fas fa-burn"
          }
        ]
      },
@ -367,93 +408,51 @@
            "displayName": "Windows registry ACL",
            "detectedIcon": "fas fa-unlock"
          }
-
        ]
      },
      {
-        "title": "Device Permissions",
-        "dataRef": "DevicePermissions",
+        "title": "Sensitive Data",
+        "dataRef": "SensitiveData",
        "patterns": [
          {
-            "searchPattern": "Permissions.PhoneCalls",
-            "displayName": "Phone calls",
-            "detectedIcon": "fa fa-phone"
+            "searchPattern": "Sensitive.Identification",
+            "displayName": "Personally identifiable data",
+            "detectedIcon": "far fa-address-card"
          },
          {
-            "searchPattern": "Permissions.SMS",
-            "displayName": "SMS",
-            "detectedIcon": "far fa-comment"
+            "searchPattern": "Sensitive.Medical",
+            "displayName": "Medical data",
+            "detectedIcon": "fas fa-stethoscope"
          },
          {
-            "searchPattern": "Permissions.Email",
-            "displayName": "Email",
-            "detectedIcon": "fa fa-envelope"
+            "searchPattern": "Sensitive.Credentials",
+            "displayName": "Credentials",
+            "detectedIcon": "fas fa-user-secret"
          },
          {
-            "searchPattern": "Permissions.CalendarEvents",
-            "displayName": "Calendar events",
-            "detectedIcon": "far fa-calendar-alt"
+            "searchPattern": "Sensitive.UserAccount",
+            "displayName": "Account or membership",
+            "detectedIcon": "fas fa-user-circle"
          },
          {
-            "searchPattern": "Permissions.Camera",
-            "displayName": "Camera",
-            "detectedIcon": "fa fa-camera"
+            "searchPattern": "Sensitive.ProductKey",
+            "displayName": "Product key",
+            "detectedIcon": "fas fa-compact-disc"
          },
          {
-            "searchPattern": "Permissions.MediaLibrary",
-            "displayName": "Media library",
-            "detectedIcon": "far fa-file-audio"
+            "searchPattern": "CryptoCurrency",
+            "displayName": "Crypto currency",
+            "detectedIcon": "fab fa-bitcoin"
          },
          {
-            "searchPattern": "Permissions.VoiceCommand",
-            "displayName": "Voice command",
-            "detectedIcon": "fa fa-bullhorn"
+            "searchPattern": "Sensitive.Secret",
+            "displayName": "Senstive secret",
+            "detectedIcon": "fab fa-keycdn"
          },
          {
-            "searchPattern": "Permissions.Microphone",
-            "displayName": "Microphone",
-            "detectedIcon": "fa fa-microphone"
-          }
-        ]
-      },
-      {
-        "title": "Other",
-        "dataRef": "Other",
-        "patterns": [
-          {
-            "searchPattern": "Data.Media",
-            "displayName": "AV media",
-            "detectedIcon": "fas fa-play-circle"
-          },
-          {
-            "searchPattern": "Data.Zipfile",
-            "displayName": "Zip file processing",
-            "detectedIcon": "far fa-file-archive"
-          },
-          {
-            "searchPattern": "HTMLForm.Defined",
-            "displayName": "HTML form",
-            "detectedIcon": "far fa-window-maximize"
-          },
-          {
-            "searchPattern": "Exception.Caught",
-            "displayName": "Exception caught",
-            "detectedIcon": "fas fa-meteor"
-          },
-          {
-            "searchPattern": "Hardware",
-            "displayName": "Specialized hardware",
-            "detectedIcon": "far fa-keyboard"
-          },
-          {
-            "searchPattern": "Comment.Fix",
-            "displayName": "Fix comments",
-            "detectedIcon": "fas fa-toolbox"
-          },
-          {
-            "searchPattern": "Comment.Suspicious",
-            "displayName": "Suspicious comments",
-            "detectedIcon": "fas fa-burn"
+            "searchPattern": "Sensitive.Financial",
+            "displayName": "Financial data",
+            "detectedIcon": "fas fa-money-bill"
          }
        ]
      }