diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c031947..37cfeb3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="c2fd5632-2143-4c7e-8b0d-96d7692b700b" name="Default" comment="">
+      <change afterPath="$PROJECT_DIR$/v2.gulpfile.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/feeds/fit.json" beforeDir="false" afterPath="$PROJECT_DIR$/feeds/fit.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/feeds/lifestyle.json" beforeDir="false" afterPath="$PROJECT_DIR$/feeds/lifestyle.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gather.js" beforeDir="false" afterPath="$PROJECT_DIR$/gather.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/html/js/app.v3.js" beforeDir="false" afterPath="$PROJECT_DIR$/html/js/app.v3.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/feeds/jobs-special.json" beforeDir="false" afterPath="$PROJECT_DIR$/feeds/jobs-special.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/plugins/filter_md_jobs.js" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/filter_md_jobs.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/plugins/filter_reject.js" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/filter_reject.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/plugins/filter_today_only.js" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/filter_today_only.js" afterDir="false" />
     </list>
     <ignored path="rinser.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -31,17 +34,53 @@
       <file leaf-file-name="jobs-special.json" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/feeds/jobs-special.json">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1590">
-              <caret line="106" column="105" selection-start-line="106" selection-start-column="105" selection-end-line="106" selection-end-column="105" />
+            <state relative-caret-position="120">
+              <caret line="8" column="23" selection-start-line="8" selection-start-column="23" selection-end-line="8" selection-end-column="23" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="jobs-new.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/jobs-new.js">
+      <file leaf-file-name="filter_today_only.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/plugins/filter_today_only.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="945">
-              <caret line="63" column="5" selection-start-line="63" selection-start-column="5" selection-end-line="63" selection-end-column="5" />
+            <state relative-caret-position="120">
+              <caret line="8" column="4" lean-forward="true" selection-start-line="8" selection-start-column="4" selection-end-line="8" selection-end-column="4" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="filter_reject.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/plugins/filter_reject.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="135">
+              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="jobs-local.json" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/feeds/jobs-local.json">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="45">
+              <caret line="3" column="24" selection-start-line="3" selection-start-column="24" selection-end-line="3" selection-end-column="24" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="filter_location.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/plugins/filter_location.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="15">
+              <caret line="1" column="39" selection-start-line="1" selection-start-column="39" selection-end-line="1" selection-end-column="39" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="filter_md_jobs.js" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/plugins/filter_md_jobs.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="135">
+              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
@@ -49,35 +88,8 @@
       <file leaf-file-name="gather.js" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/gather.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="587">
-              <caret line="140" column="9" selection-start-line="140" selection-start-column="9" selection-end-line="140" selection-end-column="9" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="app.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/dist/js/app.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="250">
-              <caret line="59" column="6" selection-start-line="59" selection-start-column="6" selection-end-line="59" selection-end-column="6" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="lifestyle.json" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/feeds/lifestyle.json">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="176">
-              <caret line="46" column="6" selection-start-line="46" selection-start-column="6" selection-end-line="46" selection-end-column="6" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="fit.json" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/feeds/fit.json">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="430">
-              <caret line="42" column="6" selection-start-line="42" selection-start-column="6" selection-end-line="42" selection-end-column="6" />
+            <state relative-caret-position="1898">
+              <caret line="147" column="5" selection-start-line="147" selection-start-column="5" selection-end-line="147" selection-end-column="5" />
             </state>
           </provider>
         </entry>
@@ -85,33 +97,26 @@
       <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/html/index.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1427" />
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="app.v3.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/html/js/app.v3.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1378">
-              <caret line="29" column="33" selection-start-line="29" selection-start-column="33" selection-end-line="29" selection-end-column="33" />
+            <state relative-caret-position="1410">
+              <caret line="94" column="31" selection-start-line="94" selection-start-column="31" selection-end-line="94" selection-end-column="31" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name=".eslintrc" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/.eslintrc">
+      <file leaf-file-name="gulpfile.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/gulpfile.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="825">
-              <caret line="55" selection-start-line="55" selection-end-line="55" />
+            <state relative-caret-position="405">
+              <caret line="27" column="27" selection-end-line="90" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="scratch_10.txt" pinned="false" current-in-tab="false">
-        <entry file="file://$APPLICATION_CONFIG_DIR$/scratches/scratch_10.txt">
+      <file leaf-file-name="v2.gulpfile.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/v2.gulpfile.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="210">
-              <caret line="14" column="325" selection-start-line="14" selection-start-column="314" selection-end-line="14" selection-end-column="325" />
+            <state relative-caret-position="360">
+              <caret line="24" column="19" selection-start-line="24" selection-start-column="19" selection-end-line="24" selection-end-column="19" />
             </state>
           </provider>
         </entry>
@@ -132,9 +137,9 @@
       <find>processJson</find>
       <find>worki</find>
       <find>techno</find>
-      <find />
+      <find>/!* &quot;name&quot;              : &quot;JobServe&quot;,*!/</find>
       <find>address</find>
-      <find />
+      <find>/* &quot;name&quot;              : &quot;JobServe&quot;,*/</find>
       <find>news</find>
       <find>jobis</find>
       <find>jobisjob</find>
@@ -146,7 +151,7 @@
       <find>trun</find>
       <find>gur</find>
       <find>http%3A%2F%2Fwww.technojobs</find>
-      <find />
+      <find>&quot;feed_url&quot;: &quot;</find>
       <find>daimanuel</find>
       <find>plan</find>
       <find>/http%3A%2F%2Fwww.jobsite</find>
@@ -165,7 +170,7 @@
       <replace>http://45.33.114.116:8080</replace>
       <replace>http</replace>
       <replace>https%3A%2F%2Fwww.technojobs</replace>
-      <replace />
+      <replace>&quot;feed_url&quot;: &quot;http://45.33.114.116:8080/</replace>
       <replace>/https%3A%2F%2Fwww.jobsite</replace>
     </replaceStrings>
     <dirStrings>
@@ -180,7 +185,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/bower.json" />
         <option value="$PROJECT_DIR$/test.js" />
         <option value="$PROJECT_DIR$/node_modules/rss-braider/lib/RssBraider.js" />
@@ -199,8 +203,6 @@
         <option value="$PROJECT_DIR$/reader.js" />
         <option value="$PROJECT_DIR$/dist/stripped.json" />
         <option value="$PROJECT_DIR$/plugins/filter_location.js" />
-        <option value="$PROJECT_DIR$/plugins/filter_md_jobs.js" />
-        <option value="$PROJECT_DIR$/plugins/filter_reject.js" />
         <option value="$PROJECT_DIR$/dist/bad.json" />
         <option value="$PROJECT_DIR$/dist/good.json" />
         <option value="$PROJECT_DIR$/bayes.js" />
@@ -225,12 +227,15 @@
         <option value="$PROJECT_DIR$/feeds/tech.json" />
         <option value="$PROJECT_DIR$/feeds/bored.json" />
         <option value="$APPLICATION_CONFIG_DIR$/scratches/scratch_10.txt" />
-        <option value="$PROJECT_DIR$/feeds/jobs-special.json" />
         <option value="$PROJECT_DIR$/.eslintrc" />
         <option value="$PROJECT_DIR$/html/js/app.v3.js" />
-        <option value="$PROJECT_DIR$/gather.js" />
         <option value="$PROJECT_DIR$/feeds/lifestyle.json" />
         <option value="$PROJECT_DIR$/feeds/fit.json" />
+        <option value="$PROJECT_DIR$/gather.js" />
+        <option value="$PROJECT_DIR$/v2.gulpfile.js" />
+        <option value="$PROJECT_DIR$/plugins/filter_reject.js" />
+        <option value="$PROJECT_DIR$/feeds/jobs-special.json" />
+        <option value="$PROJECT_DIR$/plugins/filter_md_jobs.js" />
       </list>
     </option>
   </component>
@@ -278,12 +283,44 @@
           </GulpTaskState>
         </tasks>
       </GulpfileState>
+      <GulpfileState>
+        <gulpfile-path>$PROJECT_DIR$/v2.gulpfile.js</gulpfile-path>
+        <tasks>
+          <GulpTaskState>
+            <task-name>scripts</task-name>
+          </GulpTaskState>
+          <GulpTaskState>
+            <task-name>vendor</task-name>
+          </GulpTaskState>
+          <GulpTaskState>
+            <task-name>remote</task-name>
+          </GulpTaskState>
+          <GulpTaskState>
+            <task-name>styles</task-name>
+          </GulpTaskState>
+          <GulpTaskState>
+            <task-name>partials</task-name>
+          </GulpTaskState>
+          <GulpTaskState>
+            <task-name>index</task-name>
+          </GulpTaskState>
+          <GulpTaskState>
+            <task-name>clean</task-name>
+          </GulpTaskState>
+          <GulpTaskState>
+            <dependencies>
+              <dependency value="clean" />
+            </dependencies>
+            <task-name>default</task-name>
+          </GulpTaskState>
+        </tasks>
+      </GulpfileState>
     </gulpfiles>
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
     <option name="x" value="17" />
-    <option name="y" value="43" />
+    <option name="y" value="22" />
     <option name="width" value="1759" />
     <option name="height" value="1106" />
   </component>
@@ -293,6 +330,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -305,11 +343,15 @@
               <item name="Rinser" type="462c0819:PsiDirectoryNode" />
               <item name="feeds" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="rinser" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Rinser" type="462c0819:PsiDirectoryNode" />
+              <item name="plugins" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -488,8 +530,8 @@
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Gulp.js.default" />
         <item itemvalue="Node.js.gather.js" />
+        <item itemvalue="Gulp.js.default" />
         <item itemvalue="JavaScript Debug.index.html" />
         <item itemvalue="Node.js.jobs-special.js" />
         <item itemvalue="Node.js.fixer.js" />
@@ -565,21 +607,11 @@
       <workItem from="1529358967248" duration="4995000" />
       <workItem from="1529481827961" duration="4922000" />
       <workItem from="1529861897883" duration="176000" />
-      <workItem from="1530256645652" duration="637000" />
-    </task>
-    <task id="LOCAL-00070" summary="News fix">
-      <created>1486505431154</created>
-      <option name="number" value="00070" />
-      <option name="presentableId" value="LOCAL-00070" />
-      <option name="project" value="LOCAL" />
-      <updated>1486505431155</updated>
-    </task>
-    <task id="LOCAL-00071" summary="jobs fix, reverted">
-      <created>1500370876344</created>
-      <option name="number" value="00071" />
-      <option name="presentableId" value="LOCAL-00071" />
-      <option name="project" value="LOCAL" />
-      <updated>1500370876345</updated>
+      <workItem from="1530256645652" duration="2645000" />
+      <workItem from="1530391391023" duration="153000" />
+      <workItem from="1530557207480" duration="1187000" />
+      <workItem from="1531587000308" duration="70000" />
+      <workItem from="1533827599998" duration="943000" />
     </task>
     <task id="LOCAL-00072" summary="jobs fix, reverted">
       <created>1500371543772</created>
@@ -910,28 +942,41 @@
       <option name="project" value="LOCAL" />
       <updated>1529490132511</updated>
     </task>
-    <option name="localTasksCounter" value="119" />
+    <task id="LOCAL-00119" summary="updated feeds">
+      <created>1530257417390</created>
+      <option name="number" value="00119" />
+      <option name="presentableId" value="LOCAL-00119" />
+      <option name="project" value="LOCAL" />
+      <updated>1530257417391</updated>
+    </task>
+    <task id="LOCAL-00120" summary="updated feeds">
+      <created>1530258697773</created>
+      <option name="number" value="00120" />
+      <option name="presentableId" value="LOCAL-00120" />
+      <option name="project" value="LOCAL" />
+      <updated>1530258697773</updated>
+    </task>
+    <option name="localTasksCounter" value="121" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="138651000" />
+    <option name="totallyTimeSpent" value="143012000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="17" y="43" width="1759" height="1106" extended-state="0" />
+    <frame x="17" y="22" width="1759" height="1106" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info id="Gulp" order="2" sideWeight="0.40945947" side_tool="true" visible="true" weight="0.18009207" />
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.5905405" visible="true" weight="0.18009207" />
+      <window_info id="Gulp" order="2" sideWeight="0.31910568" side_tool="true" visible="true" weight="0.18009207" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.6808943" visible="true" weight="0.18009207" />
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Docker" order="7" />
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.36999437" side_tool="true" weight="0.24975222" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.3281106" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.63000566" visible="true" weight="0.2494929" />
-      <window_info anchor="bottom" id="Version Control" order="7" sideWeight="0.59560066" weight="0.3296146" />
+      <window_info anchor="bottom" id="Version Control" order="7" sideWeight="0.59560066" visible="true" weight="0.0020283975" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.63000566" weight="0.2494929" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="bottom" id="Terminal" order="7" sideWeight="0.4838976" weight="0.32838774" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.39940536" />
       <window_info id="Favorites" order="2" side_tool="true" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.39940536" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="SonarQube" order="7" weight="0.32962137" />
       <window_info anchor="bottom" id="SonarLint" order="7" />
@@ -944,11 +989,12 @@
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="bottom" id="GitLabIntegration" order="7" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.3281106" />
     </layout>
     <layout-to-restore>
       <window_info id="Gulp" order="2" sideWeight="0.3410959" side_tool="true" weight="0.18936035" />
       <window_info anchor="bottom" id="Docker" order="13" />
-      <window_info anchor="bottom" id="Version Control" order="11" sideWeight="0.54498714" weight="0.20276953" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.3281106" />
       <window_info anchor="bottom" id="SonarQube" order="15" weight="0.32962137" />
       <window_info anchor="bottom" id="SonarLint" order="14" />
       <window_info content_ui="combo" id="Project" order="0" sideWeight="0.65890414" visible="true" weight="0.13419023" />
@@ -957,14 +1003,14 @@
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Atlassian " order="16" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.3281106" />
+      <window_info anchor="bottom" id="Terminal" order="12" sideWeight="0.4838976" weight="0.32896176" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.3997773" />
-      <window_info anchor="bottom" id="Terminal" order="12" sideWeight="0.4838976" weight="0.32896176" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.63084835" visible="true" weight="0.33333334" />
       <window_info anchor="bottom" id="Event Log" order="8" sideWeight="0.36915168" side_tool="true" visible="true" weight="0.33333334" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Version Control" order="11" sideWeight="0.54498714" weight="0.20276953" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="bottom" id="GitLabIntegration" order="10" />
       <window_info anchor="bottom" id="Application Servers" order="9" weight="0.32987553" />
@@ -1025,7 +1071,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="limit image size to 900px" />
     <MESSAGE value="force images through our image server" />
     <MESSAGE value="Max images out at 1140px wide" />
     <MESSAGE value="Reduced jpeg image quality to 80%, reduces a lot of bandwidth with not much visible impact." />
@@ -1050,7 +1095,8 @@
     <MESSAGE value="added gather" />
     <MESSAGE value="added bored" />
     <MESSAGE value="added some new feeds" />
-    <option name="LAST_COMMIT_MESSAGE" value="added some new feeds" />
+    <MESSAGE value="updated feeds" />
+    <option name="LAST_COMMIT_MESSAGE" value="updated feeds" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1077,37 +1123,6 @@
     </option>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/gather.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1755">
-          <caret line="117" column="16" selection-start-line="117" selection-start-column="16" selection-end-line="117" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/plugins/filter_location.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="1" column="39" selection-start-line="1" selection-start-column="39" selection-end-line="1" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/plugins/filter_reject.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="1" column="387" selection-start-line="1" selection-start-column="387" selection-end-line="1" selection-end-column="387" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/plugins/filter_md_jobs.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="7" selection-start-line="7" selection-end-line="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/dist/stripped.json" />
-    <entry file="file://$PROJECT_DIR$/dist/good.json" />
-    <entry file="file://$PROJECT_DIR$/dist/bad.json" />
     <entry file="file://$PROJECT_DIR$/node_modules/jsonfile/index.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="225">
@@ -1160,13 +1175,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/dist/pipes.ooappcache">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="13" selection-start-line="13" selection-end-line="13" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/dist/pipes.ooappcache" />
     <entry file="file://$PROJECT_DIR$/fixer.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="136">
@@ -1251,13 +1260,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/feeds/jobs-local.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
-          <caret line="3" column="24" selection-start-line="3" selection-start-column="24" selection-end-line="3" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/fit.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1215">
@@ -1335,13 +1337,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/feeds/jobs-special.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1590">
-          <caret line="106" column="105" selection-start-line="106" selection-start-column="105" selection-end-line="106" selection-end-column="105" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$APPLICATION_CONFIG_DIR$/scratches/scratch_10.txt">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="210">
@@ -1356,43 +1351,110 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/html/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1427" />
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/html/js/app.v3.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1378">
+        <state relative-caret-position="435">
           <caret line="29" column="33" selection-start-line="29" selection-start-column="33" selection-end-line="29" selection-end-column="33" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/gather.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="587">
-          <caret line="140" column="9" selection-start-line="140" selection-start-column="9" selection-end-line="140" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/dist/js/app.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="250">
-          <caret line="59" column="6" selection-start-line="59" selection-start-column="6" selection-end-line="59" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/feeds/lifestyle.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
+        <state relative-caret-position="690">
           <caret line="46" column="6" selection-start-line="46" selection-start-column="6" selection-end-line="46" selection-end-column="6" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/feeds/fit.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="42" column="6" selection-start-line="42" selection-start-column="6" selection-end-line="42" selection-end-column="6" />
+        <state relative-caret-position="600">
+          <caret line="40" column="19" selection-start-line="40" selection-start-column="19" selection-end-line="40" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/dist/js/app.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1814">
+          <caret line="54" column="46" lean-forward="true" selection-start-line="54" selection-start-column="46" selection-end-line="54" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/dist/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="n#style#0;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/html/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1410">
+          <caret line="94" column="31" selection-start-line="94" selection-start-column="31" selection-end-line="94" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/gulpfile.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="405">
+          <caret line="27" column="27" selection-end-line="90" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/v2.gulpfile.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="360">
+          <caret line="24" column="19" selection-start-line="24" selection-start-column="19" selection-end-line="24" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/plugins/filter_location.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="1" column="39" selection-start-line="1" selection-start-column="39" selection-end-line="1" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/feeds/jobs-local.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" column="24" selection-start-line="3" selection-start-column="24" selection-end-line="3" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/plugins/filter_reject.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/gather.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1898">
+          <caret line="147" column="5" selection-start-line="147" selection-start-column="5" selection-end-line="147" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/plugins/filter_today_only.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="8" column="4" lean-forward="true" selection-start-line="8" selection-start-column="4" selection-end-line="8" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/feeds/jobs-special.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="8" column="23" selection-start-line="8" selection-start-column="23" selection-end-line="8" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/plugins/filter_md_jobs.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
         </state>
       </provider>
     </entry>
diff --git a/feeds/jobs-special.json b/feeds/jobs-special.json
index 76ef5dd..1b13977 100644
--- a/feeds/jobs-special.json
+++ b/feeds/jobs-special.json
@@ -5,7 +5,8 @@
   "plugins": [
     "filter_location",
     "filter_reject",
-    "filter_md_jobs"
+    "filter_md_jobs",
+    "filter_today_only"
   ],
   "meta": {
     "title": "Jobs",
diff --git a/package-lock.json b/package-lock.json
index 7a1cd3b..1f789dd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -769,6 +769,11 @@
         "punycode": "1.4.1"
       }
     },
+    "bulma": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.7.1.tgz",
+      "integrity": "sha512-wRSO2LXB+qI9Pyz2id+uZr4quz5aftSN7Ay1ysr1+krzVp3utD+Ci4CeKuZdrYGc800t65b7heXBL6qw2Wo/lQ=="
+    },
     "bunyan": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-2.0.2.tgz",
diff --git a/package.json b/package.json
index cf9ae2b..7fdf888 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
   },
   "dependencies": {
     "body-parser": "^1.18.3",
+    "bulma": "^0.7.1",
     "cookie-parser": "*",
     "ejs": "^2.6.1",
     "errorhandler": "^1.5.0",
diff --git a/plugins/filter_md_jobs.js b/plugins/filter_md_jobs.js
index 1aee9be..e00b61a 100644
--- a/plugins/filter_md_jobs.js
+++ b/plugins/filter_md_jobs.js
@@ -1,8 +1,9 @@
 module.exports = function (item, itemOptions, source) {
-  var patt = /(full\w?stack|html|html5|es6|react|css|javascript|sql|node|backbone|git|gulp|jquery|express|£\dk|Data Warehouse Developer|iot|internet of things)\W/ig;
-  var result = patt.test(itemOptions.description);
-  var resultB = patt.test(itemOptions.title);
-  // return (result||resultB === true) ?  itemOptions : -1 ;
+  const patt = /(full\w?stack|html|html5|es6|react|css|javascript|sql|node|backbone|git|gulp|jquery|express|£\dk|Data Warehouse Developer|iot|internet of things)\W/ig;
+  const result = patt.test(itemOptions.description);
+  const resultB = patt.test(itemOptions.title);
+
+  return (result || resultB === true) ? itemOptions : -1 ;
   // console.log('>> Filter_md_jobs', (result||resultB === true));
-  return itemOptions;
+  // return itemOptions;
 };
diff --git a/plugins/filter_reject.js b/plugins/filter_reject.js
index e90f03a..3cefe3c 100644
--- a/plugins/filter_reject.js
+++ b/plugins/filter_reject.js
@@ -1,13 +1,12 @@
 module.exports = function (item, itemOptions, source) {
-  var patt = /(T24|Test Analyst|Insight Analyst|application tester|senior tester|Salesforce|QlikView|Navision|Murex|seo|django|drupal|SHAREPOINT|per annum|ServiceNow|Test Lead|User Researcher|Service Management|\(PERM\)|£\d.K|Remedy|ITSM|Symfony|Zend|Full Time|Technical Business Analyst|BUSINESS ANALYST|AUTOMATION TESTER|FIELD TECHNICIAN|websphere administrator|Research Data Scientist)/ig;
+  const patt = /(T24|Test Analyst|Insight Analyst|application tester|senior tester|Salesforce|QlikView|Navision|Murex|seo|django|drupal|SHAREPOINT|per annum|ServiceNow|Test Lead|User Researcher|Service Management|\(PERM\)|£\d.K|Remedy|ITSM|Symfony|Zend|Full Time|Technical Business Analyst|BUSINESS ANALYST|AUTOMATION TESTER|FIELD TECHNICIAN|websphere administrator|Research Data Scientist)/ig;
 
-  var engineers = /(Support|Devops|Planning|security|Postgresql|network|sccm|test)\s(Engineer)/ig;
-  var developers = /(Java|PHP|Graduate|Access|Oracle ADF|SHAREPOINT|Ruby on Rails|Java Software|IOS|Qlikview|)\s(Developer|C\++)/ig;
-  var architects = /(Java|PHP|Microsoft)\s(Architect)/ig;
+  const engineers = /(Support|Devops|Planning|security|Postgresql|network|sccm|test|data|imac|firewall|vmware)\s(Engineer)/ig;
+  const developers = /(Java|PHP|Graduate|Access|Oracle ADF|SHAREPOINT|Ruby on Rails|Java Software|IOS|Qlikview|)\s(Developer|C\++)/ig;
+  const architects = /(Java|PHP|Microsoft)\s(Architect)/ig;
 
-  var result = patt.test(itemOptions.description) || engineers.test(itemOptions.description) || developers.test(itemOptions.description) || architects.test(itemOptions.description);
-  var resultB = patt.test(itemOptions.title) || engineers.test(itemOptions.title) || developers.test(itemOptions.title) || architects.test(itemOptions.title);
-
-  return (result||resultB === true) ?  -1 : itemOptions;
+  const result = patt.test(itemOptions.description) || engineers.test(itemOptions.description) || developers.test(itemOptions.description) || architects.test(itemOptions.description);
+  const resultB = patt.test(itemOptions.title) || engineers.test(itemOptions.title) || developers.test(itemOptions.title) || architects.test(itemOptions.title);
 
+  return (result || resultB === true) ? -1 : itemOptions;
 };
diff --git a/plugins/filter_today_only.js b/plugins/filter_today_only.js
index 09ccf6d..5c5c006 100644
--- a/plugins/filter_today_only.js
+++ b/plugins/filter_today_only.js
@@ -1,18 +1,18 @@
 module.exports = function (item, itemOptions, source) {
-    function inDays(d1, d2) {
-        var t2 = d2.getTime();
-        var t1 = d1.getTime();
+  function inDays(d1, d2) {
+    var t2 = d2.getTime();
+    var t1 = d1.getTime();
 
-        return parseInt((t2-t1)/(24*3600*1000));
-    }
+    return parseInt((t2 - t1) / (24 * 3600 * 1000));
+  }
 
-    var now = new Date();
-    var then = new Date(itemOptions.date);
+  var now = new Date();
+  var then = new Date(itemOptions.date);
 
-    var d = inDays(then,now);
+  var d = inDays(then, now);
 
-    if (d === 0)
-        return itemOptions;
-    else
-        return -1;
+  if (d === 0)
+    return itemOptions;
+  else
+    return -1;
 };
diff --git a/v2.gulpfile.js b/v2.gulpfile.js
new file mode 100644
index 0000000..8b66c87
--- /dev/null
+++ b/v2.gulpfile.js
@@ -0,0 +1,90 @@
+"use strict";
+var gulp = require('gulp'),
+
+  autoprefixer = require('gulp-autoprefixer'),
+  cssnano = require('gulp-cssnano'),
+  jshint = require('gulp-jshint'),
+  uglify = require('gulp-uglify'),
+
+  rename = require('gulp-rename'),
+  concat = require('gulp-concat'),
+  notify = require('gulp-notify'),
+  cache = require('gulp-cache'),
+  livereload = require('gulp-livereload'),
+  htmlmin = require('gulp-htmlmin'),
+  inject = require('gulp-inject'),
+  del = require('del'),
+  htmlreplace = require('gulp-html-replace');
+
+
+var filePath = {
+  build_dir: './dist'
+};
+
+gulp.task('scripts', function() {
+  return gulp.src(['html/js/shell.js','html/js/app.v3.js'])
+    .pipe(jshint('.jshintrc'))
+    .pipe(jshint.reporter('default'))
+    .pipe(concat('app.js'))
+    /*.pipe(gulp.dest('dist/js'))*/
+    /*.pipe(rename({suffix: '.min'}))*/
+     /* .pipe(uglify({mangle: false}))*/
+    /*.pipe(concat('app.js'))*/
+    .pipe(gulp.dest('dist/js'));
+});
+
+gulp.task('vendor', function() {
+  return gulp.src(['html/libs/microevent.js','html/js/moment.min.js','html/js/ejs_production.js','html/js/jquery.unveil.js'])
+    .pipe(concat('vendor.js'))
+    .pipe(uglify({mangle: false}))
+    .pipe(gulp.dest('dist/js'));
+});
+
+gulp.task('remote', function() {
+  return gulp.src(['bower_components/mui/packages/cdn/js/mui.min.js','bower_components/jquery/dist/jquery.min.js','bower_components/string/dist/string.min.js'])
+    .pipe(concat('remote.js'))
+    .pipe(uglify({mangle: false}))
+    .pipe(gulp.dest('dist/js'));
+});
+
+gulp.task('styles', function() {
+  return gulp.src(['bower_components/mui/packages/cdn/css/mui.min.css','html/css/app.css','html/css/md.css'])
+    .pipe(autoprefixer('last 2 version', 'safari 5', 'ie 8', 'ie 9', 'opera 12.1', 'ios 6', 'android 4'))
+    /*.pipe(gulp.dest('dist/css'))*/
+    /*.pipe(rename({suffix: '.min'}))*/
+    .pipe(cssnano())
+    .pipe(concat('app.css'))
+    .pipe(gulp.dest('dist/css'));
+});
+
+gulp.task('partials', function() {
+  gulp.src(['html/ejs/**/*']).pipe(gulp.dest('dist/ejs'));
+  gulp.src(['html/icons/**/*']).pipe(gulp.dest('dist/icons'));
+  gulp.src(['html/assets/fm.png']).pipe(gulp.dest('dist/assets'));
+  gulp.src(['html/pipes.appcache']).pipe(gulp.dest('dist/'));
+});
+
+
+
+gulp.task('index', function () {
+  var sources = gulp.src(['js/apps.js', 'css/app.css'], {read: false});
+
+  return gulp.src(['html/index.html'])
+    .pipe(htmlreplace({
+      'css': 'css/app.css',
+      'js': 'js/app.js',
+      'vendor': 'js/vendor.js',
+      'remote': 'js/remote.js'
+    }))
+    .pipe(htmlmin({removeComments: true, collapseWhitespace: true, keepClosingSlash: true}))
+    .pipe(gulp.dest('dist/'));
+});
+
+gulp.task('clean', function() {
+  return del(['dist']);
+});
+
+
+gulp.task('default', ['clean'], function() {
+  gulp.start('styles', 'scripts', 'remote', 'vendor', 'partials','index');
+});