diff --git a/Makefile b/Makefile
index dce169beb..38ccaf229 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,7 @@ help:
## Miscellaneous
.PHONY: serve
-serve: node_modules
+serve: node_modules dist
$(HTTPSERVE) -p $(HTTPSERVE_PORT) -c-1
.PHONY: serve_bg
@@ -137,8 +137,10 @@ devserver: node_modules
## Builds
dist/converse.js:: node_modules
+ npm run dev
dist/converse.css:: node_modules
+ npm run dev
dist/website.css:: node_modules sass
$(SASS) --source-map true --include-path $(BOOTSTRAP) sass/website.scss $@
diff --git a/README.md b/README.md
index 8f587b717..d4a9dc8a4 100644
--- a/README.md
+++ b/README.md
@@ -108,18 +108,20 @@ In embedded mode, Converse can be embedded into an element in the DOM.
## Integration into other servers and frameworks
-- **[Prosody](https://prosody.im/)**: [mod_conversejs](https://modules.prosody.im/mod_conversejs.html)
-- **[Openfire](https://www.igniterealtime.org/projects/openfire/index.jsp)**: [inverse.jar](https://www.igniterealtime.org/projects/openfire/plugins.jsp)
-- **[Ruby on Rails](https://rubyonrails.org)**: [conversejs-rails](https://github.com/mikemarsian/conversejs-rails)
-- **[Django](https://www.djangoproject.com)**: [django-conversejs](https://pypi.python.org/pypi/django-conversejs) or [django-xmpp](https://github.com/fpytloun/django-xmpp)
-- **[Patternslib](http://patternslib.com)**: [patterns.converse](https://github.com/jcbrand/patterns.converse)
-- **[Roundcube](https://roundcube.net)**: [roundcube-converse.js-xmpp-plugin](https://github.com/devurandom/roundcube-converse.js-xmpp-plugin)
-- **[Wordpress](https://wordpress.org)**: [ConverseJS](https://wordpress.org/plugins/conversejs/)
-- **[Pàdé](https://www.igniterealtime.org/projects/pade/index.jsp)**: [Pàdé](https://www.igniterealtime.org/projects/pade/index.jsp)
-- **[Plone](https://plone.com)**: [collective.converse](https://github.com/collective/collective.converse)
- **[Alfresco](https://www.alfresco.com)**: [alfresco-js-chat-share](https://github.com/keensoft/alfresco-js-chat-share)
+- **[Django](https://www.djangoproject.com)**: [django-conversejs](https://pypi.python.org/pypi/django-conversejs) or [django-xmpp](https://github.com/fpytloun/django-xmpp)
+- **[Elgg](https://elgg.org)**: [plugin](https://elgg.org/plugins/2997196)
- **[Friendica](https://friendi.ca)**: [converse](https://github.com/friendica/friendica-addons/tree/master/xmpp/converse)
+- **[Openfire](https://www.igniterealtime.org/projects/openfire/index.jsp)**: [inverse.jar](https://www.igniterealtime.org/projects/openfire/plugins.jsp)
+- **[Patternslib](http://patternslib.com)**: [patterns.converse](https://github.com/jcbrand/patterns.converse)
+- **[Plone](https://plone.com)**: [collective.converse](https://github.com/collective/collective.converse)
+- **[Prosody](https://prosody.im/)**: [mod_conversejs](https://modules.prosody.im/mod_conversejs.html)
+- **[Pàdé](https://www.igniterealtime.org/projects/pade/index.jsp)**: [Pàdé](https://www.igniterealtime.org/projects/pade/index.jsp)
+- **[Roundcube](https://roundcube.net)**: [roundcube-converse.js-xmpp-plugin](https://github.com/devurandom/roundcube-converse.js-xmpp-plugin)
+- **[Ruby on Rails](https://rubyonrails.org)**: [conversejs-rails](https://github.com/mikemarsian/conversejs-rails)
- **[Tiki Wiki CMS Groupware](https://tiki.org)**: [built-in optional feature](https://doc.tiki.org/XMPP)
+- **[Wordpress](https://wordpress.org)**: [ConverseJS](https://wordpress.org/plugins/conversejs/)
+
## Tests
diff --git a/demo/anonymous.html b/demo/anonymous.html
index 3b1b62a58..93495661f 100644
--- a/demo/anonymous.html
+++ b/demo/anonymous.html
@@ -1,36 +1,39 @@
- Converse.js
+ Converse - Anonymous login demo
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
-
+
@@ -39,7 +42,7 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
viewBox="0 0 364 364">
- Home
+ Converse
diff --git a/demo/embedded.html b/demo/embedded.html
index f58fe367e..7c1b113c4 100644
--- a/demo/embedded.html
+++ b/demo/embedded.html
@@ -1,21 +1,26 @@
- Converse.js
+ Converse - Anonymous login demo
-
+
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
A free and open-source XMPP chat client in your browser
-
Try the fullpage and Desktop versions
+
Try the fullpage and desktop versions
@@ -146,28 +146,33 @@
+
+
@@ -192,7 +197,7 @@
Hidden messages (aka Spoilers) (XEP 382)
Client state indication (XEP 352)
OMEMO encrypted messaging (XEP 384)
-
Anonymous logins, see the anonymous login demo
+
Anonymous logins, see the anonymous login demo
Message corrections, retractions and moderation
Translated into over 30 languages