diff --git a/apps/embedded/main.js b/apps/embedded/main.js
index 829f14d..78cc10e 100644
--- a/apps/embedded/main.js
+++ b/apps/embedded/main.js
@@ -12,13 +12,16 @@ import 'oskari-loader!oskari-frontend/packages/mapping/ol/mapuserlayers/bundle.j
 
 import 'oskari-loader!oskari-frontend/packages/mapping/ol/toolbar/bundle.js';
 import 'oskari-loader!oskari-frontend/packages/framework/bundle/publishedstatehandler/bundle.js';
-import 'oskari-loader!oskari-frontend/packages/framework/featuredata2/bundle.js';
+import 'oskari-lazy-loader?featuredata!oskari-frontend/packages/framework/featuredata/bundle.js';
 import 'oskari-loader!oskari-frontend/packages/mapping/ol/infobox/bundle.js';
 import 'oskari-loader!oskari-frontend/packages/mapping/ol/drawtools/bundle.js';
 import 'oskari-loader!oskari-frontend/packages/framework/bundle/coordinatetool/bundle.js';
 import 'oskari-loader!oskari-frontend/packages/framework/bundle/timeseries/bundle.js';
 import 'oskari-lazy-loader?maplegend!oskari-frontend/packages/framework/bundle/maplegend/bundle.js';
-import 'oskari-lazy-loader?statsgrid!oskari-frontend/packages/statistics/statsgrid/bundle.js';
+import 'oskari-lazy-loader?statsgrid!oskari-frontend/bundles/statistics/statsgrid/bundle.js';
 import 'oskari-loader!oskari-frontend/packages/framework/bundle/rpc/bundle.js';
+import 'oskari-lazy-loader?layerswipe!oskari-frontend/packages/mapping/ol/layerswipe/bundle.js';
+// So someone could potentially query metadata through RPC and an embedded map:
+// import 'oskari-lazy-loader?metadatasearch!oskari-frontend/packages/catalogue/metadatasearch/bundle.js';
 
 import './css/overwritten.css';
diff --git a/apps/geoportal/main.js b/apps/geoportal/main.js
index cc1df0b..1847874 100644
--- a/apps/geoportal/main.js
+++ b/apps/geoportal/main.js
@@ -18,6 +18,8 @@ import 'oskari-loader!oskari-frontend/packages/mapping/ol/toolbar/bundle.js';
 import 'oskari-loader!oskari-frontend/packages/mapping/ol/infobox/bundle.js';
 import 'oskari-loader!oskari-frontend/packages/framework/bundle/search/bundle.js';
 import 'oskari-loader!oskari-frontend/packages/framework/layerlist/bundle.js';
+// After improving the advanced options UI
+// import 'oskari-loader!oskari-frontend/packages/catalogue/metadatasearch/bundle.js';
 import 'oskari-loader!oskari-frontend/packages/catalogue/metadatacatalogue/bundle.js';
 import 'oskari-loader!oskari-frontend/packages/catalogue/bundle/metadataflyout/bundle.js';
 import 'oskari-loader!oskari-frontend/packages/framework/bundle/coordinatetool/bundle.js';
@@ -37,7 +39,7 @@ import 'oskari-loader!oskari-frontend/packages/framework/bundle/guidedtour/bundl
 import 'oskari-loader!../../bundles/asdi-login/bundle.js';
 import 'oskari-loader!../../bundles/asdi-projection-change/bundle.js';
 
-import 'oskari-loader!oskari-frontend/packages/framework/featuredata2/bundle.js';
+import 'oskari-loader!oskari-frontend/packages/framework/featuredata/bundle.js';
 import 'oskari-loader!oskari-frontend/packages/framework/bundle/userguide/bundle.js';
 import 'oskari-loader!oskari-frontend/packages/framework/bundle/language-selector/bundle.js';
 import 'oskari-loader!oskari-frontend/packages/framework/bundle/printout/bundle.js';
@@ -49,7 +51,7 @@ import 'oskari-lazy-loader?admin-layereditor!oskari-frontend/packages/admin/bund
 import 'oskari-lazy-loader?admin-layerrights!oskari-frontend/packages/framework/bundle/admin-layerrights/bundle.js';
 import 'oskari-lazy-loader?admin-users!oskari-frontend/packages/framework/bundle/admin-users/bundle.js';
 import 'oskari-lazy-loader?admin!oskari-frontend/packages/admin/bundle/admin/bundle.js';
-import 'oskari-lazy-loader?statsgrid!oskari-frontend/packages/statistics/statsgrid/bundle.js';
+import 'oskari-lazy-loader?statsgrid!oskari-frontend/bundles/statistics/statsgrid/bundle.js';
 import 'oskari-lazy-loader?admin-layeranalytics!oskari-frontend/bundles/admin/admin-layeranalytics/bundle.js';
 
 import './css/overwritten.css';
diff --git a/bundles/asdi-login/instance.js b/bundles/asdi-login/instance.js
index 62ad559..34552e0 100644
--- a/bundles/asdi-login/instance.js
+++ b/bundles/asdi-login/instance.js
@@ -1,3 +1,6 @@
+import React from 'react';
+import { Message } from 'oskari-ui';
+
 /**
  * @class Oskari.asdi.login.BundleInstance
  */
@@ -58,9 +61,7 @@ Oskari.clazz.define('Oskari.asdi.login.BundleInstance',
                 return this.locale.guidedTour.title;
             },
             getContent: function () {
-                var content = jQuery('<div></div>');
-                content.append(this.locale.guidedTour.message);
-                return content;
+                return <Message bundleKey={this.getName()} messageKey='guidedTour.message' allowHTML />;
             },
             getLinks: function () {
                 // No links to show
diff --git a/bundles/asdi-projection-change/plugin/ProjectionChangePopup.jsx b/bundles/asdi-projection-change/plugin/ProjectionChangePopup.jsx
index 9140cc6..bd29aab 100644
--- a/bundles/asdi-projection-change/plugin/ProjectionChangePopup.jsx
+++ b/bundles/asdi-projection-change/plugin/ProjectionChangePopup.jsx
@@ -3,7 +3,8 @@ import { showPopup } from 'oskari-ui/components/window';
 import styled from 'styled-components';
 import { Message, Confirm } from 'oskari-ui';
 import { InfoIcon } from 'oskari-ui/components/icons';
-import { WarningIcon } from 'oskari-ui'
+import { WarningIcon } from 'oskari-ui';
+import { ThemeProvider } from 'oskari-ui/util';
 
 const BUNDLE_KEY = 'projection-change';
 
@@ -58,40 +59,42 @@ const checkSupported = (srsName) => {
 
 const PopupContent = ({ views, changeView, currentView, showDescription }) => {
     return (
-        <ViewsContainer>
-            {views?.map(view => (
-                <View key={view.srsName}>
-                    <ViewImage onClick={() => changeView(view.uuid, view.srsName)} src={getImageUrl(view.srsName)} active={currentView === view.srsName} />
-                    <ViewText>
-                        <Message bundleKey={BUNDLE_KEY} messageKey={`projectionCode.${view.srsName}.displayName`} />
-                        <Info
-                            onClick={() => showDescription(getImageUrl(view.srsName), view.srsName)}
-                        >
-                            <InfoIcon title={<Message bundleKey={BUNDLE_KEY} messageKey='infoPopup.title'/>} />
-                        </Info>
-                        {checkSupported(view.srsName)?.length > 0 && (
-                            <Confirm
-                                title={
-                                    <div>
-                                        <Message bundleKey={BUNDLE_KEY} messageKey='error.desc'/>
-                                        <ul className="projection-errorlist">
-                                            {checkSupported(view.srsName)?.map((unsupported, index) => (
-                                                    <li key={index}>{unsupported.getName()}</li>
-                                            ))} 
-                                        </ul>
-                                    </div>
-                                }
-                                showCancel={false}
+        <ThemeProvider>
+            <ViewsContainer>
+                {views?.map(view => (
+                    <View key={view.srsName}>
+                        <ViewImage onClick={() => changeView(view.uuid, view.srsName)} src={getImageUrl(view.srsName)} active={currentView === view.srsName} />
+                        <ViewText>
+                            <Message bundleKey={BUNDLE_KEY} messageKey={`projectionCode.${view.srsName}.displayName`} />
+                            <Info
+                                onClick={() => showDescription(getImageUrl(view.srsName), view.srsName)}
                             >
-                                <Warning>
-                                    <WarningIcon title={Oskari.getMsg(BUNDLE_KEY, 'error.hover.icon')} />
-                                </Warning>
-                            </Confirm>
-                        )}
-                    </ViewText>
-                </View>
-            ))}
-        </ViewsContainer>
+                                <InfoIcon title={<Message bundleKey={BUNDLE_KEY} messageKey='infoPopup.title'/>} />
+                            </Info>
+                            {checkSupported(view.srsName)?.length > 0 && (
+                                <Confirm
+                                    title={
+                                        <div>
+                                            <Message bundleKey={BUNDLE_KEY} messageKey='error.desc'/>
+                                            <ul className="projection-errorlist">
+                                                {checkSupported(view.srsName)?.map((unsupported, index) => (
+                                                        <li key={index}>{unsupported.getName()}</li>
+                                                ))} 
+                                            </ul>
+                                        </div>
+                                    }
+                                    showCancel={false}
+                                >
+                                    <Warning>
+                                        <WarningIcon title={Oskari.getMsg(BUNDLE_KEY, 'error.hover.icon')} />
+                                    </Warning>
+                                </Confirm>
+                            )}
+                        </ViewText>
+                    </View>
+                ))}
+            </ViewsContainer>
+        </ThemeProvider>
     );
 }
 
diff --git a/package.json b/package.json
index d674fb3..317f933 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,12 @@
 {
   "name": "asdi-frontend",
-  "version": "1.26.0",
+  "version": "1.27.0",
   "description": "Frontend for Arctic-SDI geoportal based on Oskari. Site visible in geoportal.arctic-sdi.org.",
   "keywords": [
     "Oskari"
   ],
   "dependencies": {
-    "oskari-frontend": "https://github.com/oskariorg/oskari-frontend.git#2.11.1"
+    "oskari-frontend": "https://github.com/oskariorg/oskari-frontend.git#2.13.0"
   },
   "scripts": {
     "build": "webpack --config ./node_modules/oskari-frontend/webpack.config.js --mode production --progress --env.appdef=apps",