diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94b1da9..1fd477e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.0.4
+## 03/18/2016
+1.[](#improved)  
+    * added new shortcode g-map to all pages, with replaces googlemaps plugin
+    * added misc components section
+
 # v1.0.3
 ## 03/08/2016
 1.[](#bugfix)  
diff --git a/blueprints.yaml b/blueprints.yaml
index a6445aa..0e4a8ce 100644
--- a/blueprints.yaml
+++ b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Gravstrap Theme Skeleton
-version: 1.0.3
+version: 1.0.4
 description: "Gravstrap is a powerful Grav CMS plugin which simplifies Bootstrap components usage, implementing them as shortcodes. This theme, built on top of Gravstrap, helps you to start a new Bootstrap custom theme, to create your unique design"
 icon: picture-o
 author:
diff --git a/pages/01.home/home.md b/pages/01.home/home.md
index 04d5c7b..5f25752 100644
--- a/pages/01.home/home.md
+++ b/pages/01.home/home.md
@@ -3,18 +3,6 @@ title: Home
 metadata:
   description: Gravstrap Theme helps you to start a new Grav CMS site with Bootstrap support and several ready to use modules. It is also perfect to extend to start a new Bootstrap custom theme, to fit your needs.
 slug: welcome-to-gravstrap-theme
-
-googlemaps:
-    map:
-        center: 41.90278, 12.49637
-        zoom: 12
-        #type: TERRAIN
-        markers:
-            - location: 41.90278, 12.49637
-              title: Gravstrap Theme
-              zIndex: 1
-              timeout: 1000
-              info: <strong>Meet Us</strong>.<br/>We are there!
 ---
 
 [g-jumbotron name="jumbotron1" fullwidth="true" image="bg.jpg" render=false]
@@ -145,7 +133,12 @@ Use the `Where we are` module to tell your customers where you are
 
 ___
 
-[GOOGLEMAPS:map]
+[g-map id=map zoom=12 center="41.90278,12.49637"]
+[g-map-marker location="41.90278, 12.49637" title="Gravstrap theme"]
+**Meet Us**
+We are there!
+[/g-map-marker]
+[/g-map]
 
 [/g-where-we-are]
 
diff --git a/pages/02.home_single/_contact_map/contact_map.md b/pages/02.home_single/_contact_map/contact_map.md
index a164268..f4b043e 100644
--- a/pages/02.home_single/_contact_map/contact_map.md
+++ b/pages/02.home_single/_contact_map/contact_map.md
@@ -3,19 +3,6 @@
 #SINGLE PAGE
 menu: Contact and meet us
 
-# MAP DEFINITION
-googlemaps:
-    contactmap:
-        center: 41.90278, 12.49637
-        zoom: 12
-        #type: TERRAIN
-        markers:
-            - location: 41.90278, 12.49637
-              title: Gravstrap Theme
-              zIndex: 1
-              timeout: 1000
-              info: <strong>Meet Us</strong>.<br/>We are there!
-
 # COMMENT TO PUBLISH
 published: false
 ---
@@ -28,7 +15,12 @@ Use the `Contact map` module to tell your customers position and how they can ge
 ___
 
 [g-section name="map"]
-[GOOGLEMAPS:contactmap]
+[g-map id=map zoom=12 center="41.90278,12.49637"]
+[g-map-marker location="41.90278, 12.49637" title="Gravstrap theme"]
+**Meet Us**
+We are there!
+[/g-map-marker]
+[/g-map]
 [/g-section]
 
 [g-section name="info"]
diff --git a/pages/02.home_single/_where_we_are/where_we_are.md b/pages/02.home_single/_where_we_are/where_we_are.md
index c93a567..73389de 100644
--- a/pages/02.home_single/_where_we_are/where_we_are.md
+++ b/pages/02.home_single/_where_we_are/where_we_are.md
@@ -1,18 +1,5 @@
 ---
-
 menu: Meet us
-
-googlemaps:
-    map:
-        center: 41.90278, 12.49637
-        zoom: 12
-        #type: TERRAIN
-        markers:
-            - location: 41.90278, 12.49637
-              title: Gravstrap Theme
-              zIndex: 1
-              timeout: 1000
-              info: <strong>Meet Us</strong>.<br/>We are there!
 ---
 
 [g-where-we-are attributes="id:_where_we_are,class:module where-we-are"]
@@ -22,6 +9,11 @@ Use the `Where we are` module to tell your customers where you are
 
 ___
 
-[GOOGLEMAPS:map]
+[g-map id=map zoom=12 center="41.90278,12.49637"]
+[g-map-marker location="41.90278, 12.49637" title="Gravstrap theme"]
+**Meet Us**
+We are there!
+[/g-map-marker]
+[/g-map]
 
 [/g-where-we-are]
diff --git a/pages/02.home_single/home_single_page.md b/pages/02.home_single/home_single_page.md
index c70c9e9..4c5d867 100644
--- a/pages/02.home_single/home_single_page.md
+++ b/pages/02.home_single/home_single_page.md
@@ -19,6 +19,3 @@ content:
             - _where_we_are
             - _contacts
 ---
-
-
-
diff --git a/pages/03.home_carousel/_contact_map/contact_map.md b/pages/03.home_carousel/_contact_map/contact_map.md
index 1e1461c..a0478ff 100644
--- a/pages/03.home_carousel/_contact_map/contact_map.md
+++ b/pages/03.home_carousel/_contact_map/contact_map.md
@@ -3,19 +3,6 @@
 #SINGLE PAGE
 menu: Contact and meet us
 
-# MAP DEFINITION
-googlemaps:
-    contactmap:
-        center: 41.90278, 12.49637
-        zoom: 12
-        #type: TERRAIN
-        markers:
-            - location: 41.90278, 12.49637
-              title: Gravstrap Theme
-              zIndex: 1
-              timeout: 1000
-              info: <strong>Meet Us</strong>.<br/>We are there!
-
 # COMMENT TO PUBLISH
 published: false
 ---
@@ -28,7 +15,12 @@ Use the `Contact map` module to tell your customers position and how they can ge
 ___
 
 [g-section name="map"]
-[GOOGLEMAPS:contactmap]
+[g-map id=map zoom=12 center="41.90278,12.49637"]
+[g-map-marker location="41.90278, 12.49637" title="Gravstrap theme"]
+**Meet Us**
+We are there!
+[/g-map-marker]
+[/g-map]
 [/g-section]
 
 [g-section name="info"]
diff --git a/pages/03.home_carousel/_where_we_are/where_we_are.md b/pages/03.home_carousel/_where_we_are/where_we_are.md
index ff48767..0ac4c48 100644
--- a/pages/03.home_carousel/_where_we_are/where_we_are.md
+++ b/pages/03.home_carousel/_where_we_are/where_we_are.md
@@ -1,18 +1,6 @@
 ---
 
 menu: Meet us
-
-googlemaps:
-    map:
-        center: 41.90278, 12.49637
-        zoom: 12
-        #type: TERRAIN
-        markers:
-            - location: 41.90278, 12.49637
-              title: Gravstrap Theme
-              zIndex: 1
-              timeout: 1000
-              info: <strong>Meet Us</strong>.<br/>We are there!
 ---
 
 [g-where-we-are name=where-we-are attributes="class:module where-we-are"]
@@ -22,6 +10,11 @@ Use the `Where we are` module to tell your customers where you are
 
 ___
 
-[GOOGLEMAPS:map]
+[g-map id=map zoom=12 center="41.90278,12.49637"]
+[g-map-marker location="41.90278, 12.49637" title="Gravstrap theme"]
+**Meet Us**
+We are there!
+[/g-map-marker]
+[/g-map]
 
 [/g-where-we-are]
diff --git a/pages/03.home_carousel/home_carousel.md b/pages/03.home_carousel/home_carousel.md
index a38b0e9..bd82b17 100644
--- a/pages/03.home_carousel/home_carousel.md
+++ b/pages/03.home_carousel/home_carousel.md
@@ -18,8 +18,5 @@ content:
             - _team
             - _where_we_are
             - _contacts
-
-highlight:
-    theme: ir_black
 ---
 
diff --git a/pages/07.components/01.basic/components.md b/pages/07.components/01.basic/components.md
index 11d63e2..fe4960d 100644
--- a/pages/07.components/01.basic/components.md
+++ b/pages/07.components/01.basic/components.md
@@ -5,7 +5,7 @@ metadata:
 slug: basic-shortcodes-for-grav-cms
 
 highlight:
-    theme: ir_black
+    theme: ir-black
 ---
 
 
diff --git a/pages/07.components/02.bootstrap/components.md b/pages/07.components/02.bootstrap/components.md
index ee95fb4..6492755 100644
--- a/pages/07.components/02.bootstrap/components.md
+++ b/pages/07.components/02.bootstrap/components.md
@@ -4,25 +4,8 @@ metadata:
   description: Gravstrap plugin implements all Bootstrap components you can add to any page, using powerful shortcodes syntax.
 slug: bootstrap-components-as-shortcodes-for-grav-cms
 
-simple_form:
-        token: "xxxxx"
-        template_file: default
-        redirect_to: /thank-you-for-my-page
-
-googlemaps:
-    map:
-        center: 41.90278, 12.49637
-        zoom: 12
-        #type: TERRAIN
-        markers:
-            - location: 41.90278, 12.49637
-              title: Gravstrap Theme
-              zIndex: 1
-              timeout: 1000
-              info: <strong>Meet Us</strong>.<br/>We are there!
-
 highlight:
-    theme: ir_black
+    theme: ir-black
 ---
 
 
diff --git a/pages/07.components/03.modules/components.md b/pages/07.components/03.modules/components.md
index d451c3d..20c91a7 100644
--- a/pages/07.components/03.modules/components.md
+++ b/pages/07.components/03.modules/components.md
@@ -4,36 +4,8 @@ metadata:
   description: Gravstrap plugin implements several modules you can use as shortcodes to simplify the web site building.
 slug: modules-shortcodes-for-grav-cms
 
-simple_form:
-        token: "xxxxx"
-        template_file: default
-        redirect_to: /thank-you-for-my-page
-
-googlemaps:
-    map:
-        center: 41.90278, 12.49637
-        zoom: 12
-        #type: TERRAIN
-        markers:
-            - location: 41.90278, 12.49637
-              title: Gravstrap Theme
-              zIndex: 1
-              timeout: 1000
-              info: <strong>Meet Us</strong>.<br/>We are there!
-    
-    contactmap:
-        center: 41.90278, 12.49637
-        zoom: 12
-        #type: TERRAIN
-        markers:
-            - location: 41.90278, 12.49637
-              title: Gravstrap Theme
-              zIndex: 1
-              timeout: 1000
-              info: <strong>Meet Us</strong>.<br/>We are there!
-
 highlight:
-    theme: ir_black
+    theme: ir-black
 ---
 
 [g-jumbotron name="jumbotron1" fullwidth="true" image="bg.jpg" render=false]
@@ -103,7 +75,12 @@ Use the `Contact map` module to tell your customers position and how they can ge
 ___
 
 [g-section name="map"]
-[GOOGLEMAPS:contactmap]
+[g-map id=contactmap zoom=12 center="41.90278,12.49637"]
+[g-map-marker location="41.90278, 12.49637" title="Gravstrap theme"]
+**Meet Us**
+We are there!
+[/g-map-marker]
+[/g-map]
 [/g-section]
 
 [g-section name="info"]
@@ -138,7 +115,12 @@ Saturday - Sunday Closed
     ___
 
     [g-section name="map"]
-    {GOOGLEMAPS:contactmap}
+    [g-map id=contactmap zoom=12 center="41.90278,12.49637"]
+    [g-map-marker location="41.90278, 12.49637" title="Gravstrap theme"]
+    **Meet Us**
+    We are there!
+    [/g-map-marker]
+    [/g-map]
     [/g-section]
 
     [g-section name="info"]
@@ -163,8 +145,6 @@ Saturday - Sunday Closed
     [/g-contacts-map]
     [/raw]
 
->>> Please note that `GOOGLEMAPS` definition must be surrounded by **[ ]** instead of **{ }**: that was only a rendering trick.
-
 ___
 
 ## Contacts module
@@ -459,7 +439,12 @@ Use the `Where we are` module to tell your customers where you are
 
 ___
 
-[GOOGLEMAPS:map]
+[g-map id=map zoom=12 center="41.90278,12.49637"]
+[g-map-marker location="41.90278, 12.49637" title="Gravstrap theme"]
+**Meet Us**
+We are there!
+[/g-map-marker]
+[/g-map]
 
 [/g-where-we-are]
 
@@ -473,14 +458,16 @@ ___
 
     ___
 
-    {GOOGLEMAPS:map}
+    [g-map id=map zoom=12 center="41.90278,12.49637"]
+    [g-map-marker location="41.90278, 12.49637" title="Gravstrap theme"]
+    **Meet Us**
+    We are there!
+    [/g-map-marker]
+    [/g-map]
 
     [/g-where-we-are]
     [/raw]
 
->>> Please note that `GOOGLEMAPS` definition must be surrounded by **[ ]** instead of **{ }**: that was only a rendering trick.
-
-
 ## Footer One module
 
 [g-footer-one]
diff --git a/pages/07.components/04.dynamic/dynamic_components.md b/pages/07.components/04.dynamic/dynamic_components.md
index a160349..4851cb3 100644
--- a/pages/07.components/04.dynamic/dynamic_components.md
+++ b/pages/07.components/04.dynamic/dynamic_components.md
@@ -4,25 +4,8 @@ metadata:
   description: Use available components rendering them by their templates when you need to represent dynamic data fetched from an external source.
 slug: dynamic-bootstrap-components-as-shortcodes-for-grav-cms
 
-simple_form:
-        token: "xxxxx"
-        template_file: default
-        redirect_to: /thank-you-for-my-page
-
-googlemaps:
-    map:
-        center: 41.90278, 12.49637
-        zoom: 12
-        #type: TERRAIN
-        markers:
-            - location: 41.90278, 12.49637
-              title: Gravstrap Theme
-              zIndex: 1
-              timeout: 1000
-              info: <strong>Meet Us</strong>.<br/>We are there!
-
 highlight:
-    theme: ir_black
+    theme: ir-black
 ---
 
 
diff --git a/pages/07.components/05.misc/bg.jpg b/pages/07.components/05.misc/bg.jpg
new file mode 100644
index 0000000..bee317c
Binary files /dev/null and b/pages/07.components/05.misc/bg.jpg differ
diff --git a/pages/07.components/05.misc/components.md b/pages/07.components/05.misc/components.md
new file mode 100644
index 0000000..918be3f
--- /dev/null
+++ b/pages/07.components/05.misc/components.md
@@ -0,0 +1,52 @@
+---
+title: Miscellaneous components
+metadata:
+  description: A set of miscellaneous components.
+slug: miscellaneous-components-as-shortcodes-for-grav-cms
+
+highlight:
+    theme: ir-black
+---
+
+
+[g-jumbotron name="jumbotron1" fullwidth="true" image="bg.jpg" render=false]
+# Miscellaneous components
+
+A set of useful, not classificable, components 
+
+[/g-jumbotron]
+
+# Miscellaneous components for Grav CMS
+A comprehensive list of several miscellaneous components, you can use for free as shortcodes in your website.
+
+
+## Map
+
+[g-map id=map zoom=12 center="41.90278,12.49637"]
+[g-map-marker location="41.90278, 12.49637" title="Gravstrap theme"]
+**Meet Us**
+We are there!
+[/g-map-marker]
+[/g-map]
+
+#### Code definition
+
+    [raw]
+    [g-map id=map zoom=12 center="41.90278,12.49637"]
+    [g-map-marker location="41.90278, 12.49637" title="Gravstrap theme"]
+    **Meet Us**
+    We are there!
+    [/g-map-marker]
+    [/g-map]
+    [/raw]
+
+
+## Simple form
+
+[g-simple-form token="xxxxx" redirect_to="/thank-you-for-my-page" render=true][/g-simple-form]
+
+#### Code definition
+
+    [raw]
+    [g-simple-form token="xxxxx" redirect_to="/thank-you-for-my-page" render=true][/g-simple-form]
+    [/raw]
\ No newline at end of file