+
+* __If you're an extrovert, linguist__
+
+Federated socializing is your cup of tea. Currently[^2] there are about 2.000.000 registered users in the Fediverse online world. Compared to corporate giants, that's like a small eco village.
+
+
+
+It's natural in Fediverse to welcome new users, to start conversations with anyone who shares your interests, to follow strangers. Do you easily connect with people from other cultures and regions? Would you like to broaden your social network and become neighbours and friends with people from somewhere on the other side of the map from you? We have communities dedicated to all sorts of [hobbies](/en/portal/servers/index.html#hobbies), [regions](/en/portal/servers/index.html#regional), [languages](/en/portal/servers/index.html#languages), political and social [views](/en/portal/servers/index.html#political-and-social-views), [business](/en/portal/servers/index.html#economics-business), [ecology and animal](/en/portal/servers/index.html#ecology-animal-lovers) related servers, [books, shows and games](/en/portal/servers/index.html#entertainment). Choose your community.
+
+* __If you're an introvert, nerd, geek, scholar, developer__
+
+A wonder you're still not part of Fediverse! It's your space, it's full of people like you. We're scattered across Fediverse servers, searching for kindred spirits. There are communities for [researchers](/en/portal/servers/index.html#sciences), [bookworms](/en/portal/servers/index.html#humanities), [game developers](/en/portal/servers/index.html#gamedev), web developers and [techies](/en/portal/servers/index.html#servers-for-techies), as well as servers run by respectable [organizations](/en/portal/servers/index.html#run-by-tech-savvy-organizations) and [entities](/en/portal/servers/index.html#notable-mention).
+
+* __If you're a content creator, freelance artist__
+
+Your content should be yours, without granting the explicit rights to any corporate third parties. Fediverse communities have high opinions of creators and willingly support their work through donations. We have communities for [writers, artists and photographers](/en/portal/servers/index.html#humanities). Here're recommentations on [how to become a successful artist on Mastodon](https://blog.joinmastodon.org/2018/06/how-to-become-a-successful-artist-on-mastodon/). Share your talents with fedizens.
+
+* __If you've been censored on centralized platforms__
+
+Federated social networks do not have one holy administrator who decides whom and what to ban. You'll find [multiple](/en/portal/servers/index.html#safe-spaces) servers for sensitive, vulnerable communities. Unlike on mainstream social networks, you will not be silenced for personal views. It's customary to share some images and content adding a special #NSFW tag (not safe for work): for spoilers, content inappropriate for children or for people at work. Remember still that each server is run by a volunteer, living in some country with its laws and regulations. Most servers have local rules, and your administrator has the power to ask you leave if you do something nasty. You'll be able to migrate to another server and do nasty things again, but you'd rather not. Spammers are not welcome, Fediverse administrators quickly react and share information withing the community. Other users have the ability to "ignore" or "mute" people who irritate them. **Being nice to each other** is a tradition here.
+
+* __If you care about privacy, are a privacy advocate or NGO__
+
+Then you definitely heard about [Snowden revelations](https://en.wikipedia.org/wiki/Edward_Snowden), [Cambridge](https://www.techradar.com/news/us-uk-investigating-facebooks-role-in-cambridge-analytica-data-breach) [Analytica](https://www.schneier.com/blog/archives/2018/03/facebook_and_ca.html), [Equifax breach](https://krebsonsecurity.com/2017/09/breach-at-equifax-may-impact-143m-americans), [Twitter Masking](https://krebsonsecurity.com/2018/05/twitter-to-all-users-change-your-password-now), [Securus / LocationSmart](https://krebsonsecurity.com/2018/05/tracking-firm-locationsmart-leaked-location-data-for-customers-of-all-major-u-s-mobile-carriers-in-real-time-via-its-web-site), [Exactis leak](https://www.wired.com/story/exactis-database-leak-340-million-records), [manipulative practices](https://www.schneier.com/blog/archives/2018/06/manipulative_so.html), multiple user data hacks, and so on and so forth. Big centralized websites with big juicy collections of data are [useful](https://warontherocks.com/2018/02/wall-wall-fortresses-fail) for mass surveillance.
+
+Are your friends aware of it? By leaving mainstream networks behind and joining Fediverse you do not automatically gain privacy. Securing data is hard, and federated networks will not protect you from targeted state surveillance. They will, however, protect from corporate mass surveillance. Especially if you spin up your own personal server, secure it, and host it at home. By inviting friends and family to Fediverse you help them treat their personal data wisely, you also help them broaden horizons, find out more about free and open source movements, become technically skilled. Everyone curious who likes to explore will learn in Fediverse.
+
+As a privacy rights organization, by opening your own server or your official Fediverse account on one of the existing servers, and inviting followers on mainstream networks to join you in Fediverse, you help make bulk data collection more diffuclt and costly.
+
+* __If you're a troll__
+
+Fediverse has a [server](https://mordor.social) in your honour! Be nice to each other.
+
+
+
+* __If you don't like to share your telephone number with "pickup artists"__
+
+Those who invented "pickup" thingy were on a mission to help people stay single, right? When someone weird approaches you in real life and you don't know what to make of them, why share your phone number or email? If you wish to test their Internet IQ and determination, tell them you'll meet them in Fediverse. A Fediverse account resembles an email and includes your nickname and your server URL - for example, jane@nerdpol.ch. Anyone who really wants to connect with you, will find the way to join Fediverse and search for your profile.
+
+* __If you're a big corp engineer, secret agent__
+
+Then you're clever. Are you capable of empathy? Come on the light side. Transparency is your power, and there's nothing old-fashioned about privacy for your family and loved ones. Just like for all the other citizens of the world. If you know that at heart, you will be invaluable in building social networking the right way.
+
+
+__Not convinced yet? Ask this__
+
+CRYSTAL BALL
+
+...and it will show the reason just for you.
+
+Federated networks won't track you, bombard with "personalized" ads or predefine your timeline (stream) with algorithms. You will be the one to decide what to see in your timeline, by following the topics you're interested in (subscribing to tags in [diaspora](/en/diaspora), [Mastodon](/en/mastodon)), connecting with people you like, joining groups and forums (in [Friendica](/en/friendica), [Hubzilla](/en/hubzilla)). Come join us!
+
+Fediverse networks are not ideal. They lack some features provided by mass networks. This is because they are not backed by millions of dollars big companies have, they're developed by people like you and me, in their spare time, for free or for donations from the community. If you want to help improve any of the federated platforms, don't hesitate to ask how to help and start contributing. Welcome!
+
+[^1]: To be sure which other networks your chosen Fediverse network connects with, check "Connects" information on each network's page
+
+[^2]: Two million registered users is an approximation, as of June 2018
diff --git a/source/_posts/fediverse-saves-from-pickup-artists-and-7-more-reasons-to-join/banner.jpg b/source/_posts/fediverse-saves-from-pickup-artists-and-7-more-reasons-to-join/banner.jpg
new file mode 100755
index 0000000..98cade2
Binary files /dev/null and b/source/_posts/fediverse-saves-from-pickup-artists-and-7-more-reasons-to-join/banner.jpg differ
diff --git a/source/_posts/fediverse-saves-from-pickup-artists-and-7-more-reasons-to-join/feditroll.jpg b/source/_posts/fediverse-saves-from-pickup-artists-and-7-more-reasons-to-join/feditroll.jpg
new file mode 100644
index 0000000..5697541
Binary files /dev/null and b/source/_posts/fediverse-saves-from-pickup-artists-and-7-more-reasons-to-join/feditroll.jpg differ
diff --git a/source/_posts/fediverse-saves-from-pickup-artists-and-7-more-reasons-to-join/fediverse-garden.jpg b/source/_posts/fediverse-saves-from-pickup-artists-and-7-more-reasons-to-join/fediverse-garden.jpg
new file mode 100644
index 0000000..0da907a
Binary files /dev/null and b/source/_posts/fediverse-saves-from-pickup-artists-and-7-more-reasons-to-join/fediverse-garden.jpg differ
diff --git a/source/_posts/fediverse-saves-from-pickup-artists-and-7-more-reasons-to-join/fediverse-sign.jpg b/source/_posts/fediverse-saves-from-pickup-artists-and-7-more-reasons-to-join/fediverse-sign.jpg
new file mode 100644
index 0000000..68ea7a3
Binary files /dev/null and b/source/_posts/fediverse-saves-from-pickup-artists-and-7-more-reasons-to-join/fediverse-sign.jpg differ
diff --git a/source/_posts/why-use-federated-networks.md b/source/_posts/why-use-federated-networks.md
deleted file mode 100644
index acb94f6..0000000
--- a/source/_posts/why-use-federated-networks.md
+++ /dev/null
@@ -1,26 +0,0 @@
-
----
-layout: "post"
-title: "Why use federated networks (updated)"
-date: 2018-06-21
-tags:
- - fediverse
-preview:
- "This article is a stub. You can help the Fediverse website by expanding it. Anyone welcome to contribute. It may be a less technical article, for your friend and your grandma. Explaining with examples why privacy is important, how corporate entities are misusing their capabilities, etc."
-url: "/en/post/why-use-federated-networks"
-lang: en
-featured: true
-banner: "banner.jpg"
-authors:
- - Jane Doe
----
-
-This article is a stub. You can help the Fediverse website by expanding it. Anyone welcome to contribute.
-
-It may be a less technical article, for your friend and your grandma. Explaining with vivid examples why privacy is important, how corporate entities are misusing their capabilities, etc.
-
-See [this article](https://signal.org/blog/the-ecosystem-is-moving) by M. Marlinspike elaborating on why federation *is not* the future.
-
-There are few articles about the strong points of federated / decentralized networks on the net. Some of those are research papers using obscure scientific language. Would be nice to have a thorough writing on why Moxy didn't get the point of federation. May be its point is not about providing same smooth experience for everyone (which, really, is quite hard). May be its point is in promoting a new concept, users expecting to lose certain convenient features of centralized systems in exchange for benefits that a centralized system can not guarantee. Singling out these benefits, as well as describing weak points of centralized systems is desirable. Add facts / links to many recent data breaches, misuse of centralized networks, etc.
-
-Please, join and [contribute](https://gitlab.com/fediverse/fediverse.gitlab.io/blob/master/CONTRIBUTING.md) to complete this article.
diff --git a/source/_posts/why-use-federated-networks/banner.jpg b/source/_posts/why-use-federated-networks/banner.jpg
deleted file mode 100644
index 8aadeba..0000000
Binary files a/source/_posts/why-use-federated-networks/banner.jpg and /dev/null differ
diff --git a/source/en/crystalball/index.md b/source/en/crystalball/index.md
new file mode 100644
index 0000000..eef7e20
--- /dev/null
+++ b/source/en/crystalball/index.md
@@ -0,0 +1,5 @@
+
+---
+layout: "crystalball"
+title: "Fediverse Crystal Ball"
+---
diff --git a/source/en/portal/servers/index.md b/source/en/portal/servers/index.md
new file mode 100644
index 0000000..70d0b48
--- /dev/null
+++ b/source/en/portal/servers/index.md
@@ -0,0 +1,266 @@
+
+---
+layout: "post"
+title: "Themed servers"
+---
+
+This is a list of themed servers. Currently it includes mostly [Mastodon](/en/mastodon) servers. This will change in future updates.
+Servers are not restricted to their theme. They only help people with common interests find their community.
+
+
+
+#### [Notable mention](#notable-mention)
+
+* https://social.lab.cultura.gov.br - by FOSS lab of Brazilian Ministry of Culture
+* https://mastodon.mit.edu - for the MIT community
+* https://mastodon.acc.sunet.se - by Academic Computer Club at Umeå University, Sweden
+* https://mastodon.iut-larochelle.fr - by University of La Rochelle
+* https://mastodon.redbrick.dcu.ie - by Redbrick, computer networking society of Dublin City University
+* https://mastodonevry.ovh - for l'Université d'Evry-Val-d'Essonne students
+* https://mastodon.etalab.gouv.fr - for French public servants who are involved in innovative projects
+
+#### [Run by tech-savvy organizations](#run-by-tech-savvy-organizations)
+
+* https://en.osm.town - for the OpenStreetMap Community
+* https://fr.osm.social - for francophone OpenStreetMap Community
+* https://chaos.social - CCC related
+* https://framapiaf.org - by Framasoft, association promoting FOSS, providing privacy-respecting services
+* https://mastodon.dotopia.dk - by DO:TOPIA, Denmark based tech activism collective
+* https://mastodon.hackerlab.fr - by Hackerlab
+* https://mi.pede.rs - by Hacklab-in-Mama hackerspace, Zagreb
+* https://social.weho.st - by WeHost, non-profit internet service provider, Amsterdam
+* https://m.g3l.org - by G3L, libre software association
+* https://mastodon.nzoss.nz - by New Zealand Open Source Society
+* https://mamot.fr - by Quadrature du Net, association for the defence of digital rights and freedoms
+* https://mastodon.roflcopter.fr - by Roflcopter, [CHATONS](https://chatons.org) member
+* https://mastodon.zaclys.com - by Zaclys, association offering francophone privacy-respecting services
+* https://social.buffalomesh.net - by Buffalomesh, mesh network in Buffalo, NY
+* https://social.chinwag.im - by Chinwag project
+* https://eunivers.social - by Eunivers online edition
+* https://mastodon.freifunk-muensterland.de - by Freifunk Muensterland
+* https://unixcorn.xyz - by Unixcorn
+
+#### [Servers for techies](#servers-for-techies)
+* https://infosec.exchange - infosec and IT security discussions
+* https://naos.crypto.church - powers of cryptography and cryptanalysis
+* https://zerohack.xyz - hacking centric: programming, Linux, BSD, Ethics, whatever
+* https://geeks.one - for humans and geeks
+* https://mastodon.technology - for people interested in technology
+* https://fosstodon.org - dedicated to Free and Open Source Software
+* https://floss.social - for people who support or build Free Libre Open Source Software
+* https://tuxspace.net - for Linux lovers, users, sysadmins, and the like
+* https://mastodon.horde.net.br - to bring together enthusiasts of free software
+* https://miaou.drycat.fr - for geeks, FOSS and cat lovers, [CHATONS](https://chatons.org) member
+* https://mastodon.partecipa.digital - conversations about IT, Open Source, Linux
+* https://pao.moe - cat, FOSS, nix
+* https://linuxrocks.online - dedicated to Linux and technologies
+* https://functional.cafe - for people interested in functional programming and languages
+* https://social.csswg.org - for anyone interested in CSS or general web development
+* https://oldbytes.space - for old hardware fans
+* https://mathstodon.xyz - for Maths people
+* https://cb.ku.cx - all things Technology, hacking, security and reverse engineering
+* https://bsd.network - for *BSD users and devs
+* https://fasterwhen.red - automotive- and engineering-related topics
+* https://recurrent.network - all things artificial neural network-related
+* https://idevs.id - home to developer, programmer, coder
+* https://vpn.tv - for VPN operators, users and enthusiasts
+
+#### [Gamedev](#gamedev)
+* https://mastodon.gamedev.place - gamedev and related professions
+* https://elekk.xyz - by gamers, for gamers
+* https://mastodon.sergal.org - general trends toward tech, games, and everything fluffy
+* https://robloxcommunity.social - for those part of or interested in the ROBLOX and RBXDev community
+* https://social.noff.co - for tech, gaming, and good times
+* https://unityjp-mastodon.tokyo - Unity Japan
+* https://gonext.gg - esports-centric with focus on competitive gaming
+* https://gamemaking.social - amateur videogame making: game writers, game players welcome
+
+#### [Entertainment](#entertainment)
+* https://tenforward.social - theme Star Trek
+* https://moseisley.club - theme Star Wars
+* https://wowsdon.xyz - theme World of WarShips
+* https://kirakiratter.com - for Aikatsu fans
+* https://donphan.social - for Pokémon enthusiasts
+* https://inkopolis.cafe - for Splatoon 2 players
+
+#### [Humanities](#humanities)
+* https://mastodon.art - for artists
+* https://mastodon.cc - for art
+* https://paintacu.be - painting community
+* https://artalley.porn - for artists and commissioners
+* https://baraag.net - freely share all types of art, uncensored, 18+
+* https://bookwor.ms - for book-lovers
+* https://booktoot.club - for sharing and discussing books
+* https://www.bookbeezhive.com - for authors and their readers
+* https://writing.exchange - community for poets, writers, bloggers
+* https://wandering.shop - science fiction and fantasy community
+* https://imaginair.es - for writers, photographers, painters, cartoonists and people with imagination
+* https://social.nasqueron.org - for creative people, writers, developers and thinkers
+* https://bookwitty.social - dedicated to discovering books
+* https://vis.social - for anyone into data, visualization, creative coding, related arts and research
+* https://photog.social - place for your photos
+* https://music.glitch.pizza - dedicated to talking about and sharing music
+* https://linernotes.club - for fans of recorded music
+* https://ausglam.space - for Australian galleries, libraries, archives, museums and records people
+* https://spooky.pizza - for linguists and linguist-adjacent people
+
+#### [Sciences](#sciences)
+* https://scholar.social - for researchers, undergrads, journal editors, librarians, administrators
+* https://scicomm.xyz - discussions for scientists and science enthusiasts
+* https://mastodon.huma-num.fr - dedicated to the higher education and research
+* https://tusk.schoollibraries.net - to help educators improve the School Libraries Resource Network
+
+#### [Hobbies](#hobbies)
+* https://makestuff.club - for people that make stuff
+* https://pod.social - for podcast creators, listeners, and enthusiasts
+* https://radiosocial.org - for radio amateurs, DXers and anyone interested to geek out about radio
+* https://smusi.ch - for musicians, by musicians
+* https://metalhead.club - for metal friends
+* https://electro.social - for electronic music enthusiasts, and electro music makers
+* https://mastodon.flights - focused on travel, world affairs and jet setting lifestyles
+* https://boardgames.social - for board gamers and the games they love
+* https://pipes.social - hobby of pipe collecting and pipe smoking
+* https://mastodon.beerfactory.org - for beermakers
+* https://mastd.racing - dedicated to motosports
+* https://2ndamendment.social - have the freedom to discuss, share and show off your guns
+* https://onthesecond.com - for those who Love liberty, guns, and independence
+* https://digipres.club - conversations about digital preservation
+* https://newtype.institute - anime-centric community
+* https://weebs.moe - anime, manga
+* https://occult.camp - focused on spitituality, witchcraft and various shades of woo
+* https://witchcraft.cafe - for witches
+* https://witchey.club - for anyone curious about witchcraft
+* https://hodl.social - place to discuss Stellar, cryptocurrencies and blockchain
+
+#### [Languages](#languages)
+* https://esperanto.masto.host - for those interested in Esperanto
+* https://masto.pt - for people speaking Portugese
+* https://tooot.im - main instance language is Hebrew
+* https://persadon.com - for Persian speaking folks
+* https://the.wired.sehol.se - for Hungarian speakers
+* https://toot.si - Slovenian (multilingual) instance
+* https://tootcn.com - Chinese instance
+* https://mamut.social - primarily for Spanish speaking people
+
+#### [Regional](#regional)
+* https://bonn.social - Bonn, Germany
+* https://toot.berlin - Berlin, Germany
+* https://muenster.im - Münsterland, Germany
+* https://ruhr.social - Ruhr area, Germany
+* https://ps.s10y.eu - like-minded people in Brussels, Belgium
+* https://mastoton.fi - Finland
+* https://snabeltann.no - Norway
+* https://www.sosial.eu - Norway
+* https://mastodon.se - Sweden
+* https://gr.social - Greece
+* https://babelut.be - Belgium
+* https://mastodont.cat - Catalonia
+* https://occitanie.social - Occitania
+* https://bne.social- Queensland, Australia
+* https://mastodon.uy - Uruguay
+* https://mastodon.scot - Scotland, or who identify as Scottish
+* https://mastodon.me.uk - UK tech community
+* https://manx.social - the Isle of Man
+* https://masto.donte.com.br - Brazil
+* https://mastodon.floripa.br - companies and startups in Florianópolis, Brazil
+* https://mastodonchile.club - users latinos, especially from Chile
+* https://pnw.social - citizens of Washington, Oregon, Idaho, Western Montana, and Alaska
+* https://riverwest.xyz - Riverwest neighborhood of Milwaukee, Wisconsin, USA
+* https://toot.memtech.website - Memphis tech community, USA
+* https://techandbeer.social - tech and beer in Orlando, USA
+* https://valleypost.us - residents and stakeholders in the Valley, USA
+* https://mspsocial.net - Twin Cities of Minneapolis and St. Paul, Minnesota, USA
+* https://kokomo.space - community of Kokomo city, Indiana, USA
+* https://opensocial.africa - for Africa, by Africans
+* https://polska.masto.host - Poland
+
+#### [Political and social views](#political-and-social-views)
+* https://todon.nl - for leftists, socialists, anarchists, Marxists, social democrats, social liberals
+* https://hispagatos.space - for hackers, social anarchists, and anarchist hackers
+* https://libertarian.chat - a community driven instance for people who love liberty
+* https://voluntary.world - for voluntaryists, anarcho-capitalists, non-aggression centered activists
+* https://anarchism.space - for social anarchists
+* https://insoumis.social - for comrades, combatants, fighters
+* https://sosh.network - for freedom of thought, of opinion, of conversation
+* https://roughseas.xyz - for libertarians, classical liberals, right-of-center thinkers, gun owners
+* https://thepeanut.farm - for center-leftists worldwide
+* https://sunbeam.city - focusing on the solarpunk aesthetic (anarchist, anti-capitalist, utopian)
+* https://anticapitalist.party
+* https://cheeky.red
+
+#### [Economics, business](#economics-business)
+* https://social.outsourcedmath.com - discussing finance and investing
+* https://hiddan.net - a safe space for entrepreneurs
+
+#### [Ecology, animal lovers](#ecology-animal-lovers)
+* https://mastodon.latransition.org - francophone movement for ecological transition
+* https://toot.cat
+* https://pets-in.space
+
+#### [Safe spaces](#safe-spaces)
+* https://trans.town - all trans people welcome
+* https://queer.party - for queer folk and non-queer folk alike
+* https://queer.town - space for queer people to be positive and have fun
+* https://social.wxcafe.net - for social justice activists, LGBTQIA+ people
+* https://lgbt.io - for LGBT+ and allies
+* https://tech.lgbt - for tech workers, academics, students, and others in tech who are LGBTQA+ or allies
+* https://instance.business - a safe place for nonwhite people on the fediverse
+* https://pipou.academy - emphasis on kindness
+* https://biscuit.town - feminist movement and queer/lgbt+
+* https://eldritch.cafe - for queer, feminist and anarchist people
+
+#### [For people with a sense of self-irony](#for-people-with-a-sense-of-self-irony)
+* https://shitter.me - the sky is the limit
+* https://i.write.codethat.sucks
+* https://sleeping.town - for people who like to sleep
+* https://bibeogaem.zone - "nice place for silly people"
+* https://society.oftrolls.com - mild trolling encouraged, but not required
+* https://ephemeral.glitch.social - toots are ephemeral and disappear after a while
+* https://dolphin.town - instance where you can only say the letter 'e'
+* https://botsin.space - for bots
+
+#### [Characters](#characters)
+* https://dragon.style - for dragons, and people who like dragons
+* https://monsterpit.net - for monsters, demons, aliens, strange creatures, and those who love them
+* https://equestria.social - for pony fans
+
+#### [Subcultures](#subcultures)
+* https://yiff.rocks - for furries, by furries
+
+#### [Notable generalistic](#notable-generalistic)
+* https://projectx.fun - will be open for up to 100 users, for sanity and sustainability
+* https://nulled.red - refuses to block or silence any instances
+* https://waifu.one - no censorship, no instances are blocked
+* https://ieji.de - no logs, has Tor .onion address
+* https://inscope.social - for those who help to get us onto the best possible future
+* https://tootplanet.space - beautiful landing
+* https://assortedflotsam.com - instance committed to truth in discourse
+* https://bigdoinks.online - a small community for jokes, goofs, and bits
+* https://social.wiuwiu.de - powered by 100% clean energy
+* https://mstdn.fr - by sysadmins, with a goal to provide robust experience for tens of thousands of users
+* https://sn.angry.im - wise recommendation to set up own node, if possible, for healthy ecosystem
+* https://scifi.fyi - runs glitch-soc, a version of Mastodon with experimental new features
+* https://mastodonten.de - an instance for nice people
+* https://mstdn.gnous.eu - instance francophone
+* https://mcr.cool - for good and fun times
+* https://7nw.eu - always running on the last tagged release
+* https://colloportus.me - leave big social media and get back to social networking
+* https://social.openalgeria.org
+* https://social.datensturm.net
+* https://mastodon.fun
+* https://nicepeople.social
+* https://trillion.social
+* https://toot.chat
+* https://tootme.de
+* https://kyot.me
+
+#### Disclaimer
+Following instances skipped: closed registration *at the moment of checking*, running old code, description not understood due to language barrier or scarce description, long blocklists, experimental servers.
+
+Add your own themed instance via [merge request](https://gitlab.com/distributopia/masto-world-overview). If your server already has many users, it will be nice of you to let other servers grow, for a healthier decentralization.
+
+
+## Other research links
+- [Friendica world overview](https://gitlab.com/distributopia/friendica-world-overview)
+- [Fediverse pirate servers](https://gitlab.com/distributopia/caramba)
+- [Mastodon server distribution](https://chaos.social/@leah/99837391793032137) research by Leah
diff --git a/source/img/authors/default-avatar.png b/source/img/authors/default-avatar.png
deleted file mode 100644
index 5053ea1..0000000
Binary files a/source/img/authors/default-avatar.png and /dev/null differ
diff --git a/source/img/ball.jpg b/source/img/ball.jpg
new file mode 100644
index 0000000..7bef6f7
Binary files /dev/null and b/source/img/ball.jpg differ
diff --git a/themes/starter/.eslintrc b/themes/starter/.eslintrc
index 88cf129..b15c30e 100644
--- a/themes/starter/.eslintrc
+++ b/themes/starter/.eslintrc
@@ -9,7 +9,7 @@
"parser": "babel-eslint",
"env": {
"browser": true,
- "jquery": true
+ "node": true
},
"extends": [
"eslint:recommended"
diff --git a/themes/starter/gulpfile.js b/themes/starter/gulpfile.js
index 0bd382f..3e04a31 100644
--- a/themes/starter/gulpfile.js
+++ b/themes/starter/gulpfile.js
@@ -14,8 +14,9 @@
sass = require('../../node_modules/gulp-sass'),
sourcemaps = require('../../node_modules/gulp-sourcemaps'),
stylelint = require('../../node_modules/gulp-stylelint'),
- tinypng = require('../../node_modules/gulp-tinypng-extended'),
- uglify = require('../../node_modules/gulp-uglify');
+ tinypng = require('../../node_modules/gulp-tinypng-extended'),
+ uglify = require('../../node_modules/gulp-uglify'),
+ webpack = require('webpack-stream');
function customPlumber (errTitle) {
return plumber({
@@ -69,6 +70,7 @@
.pipe(customPlumber('Ouch! Error Running Scripts'))
.pipe(eslint())
.pipe(eslint.format())
+ .pipe(webpack( require('./webpack.config.js') ))
//.pipe(concat('main.js'))
.pipe(rename({ suffix: '.min' })) // for using in dev mode
.pipe(sourcemaps.write('./'))
diff --git a/themes/starter/languages/en.yml b/themes/starter/languages/en.yml
index 65ea4d2..fbc0813 100644
--- a/themes/starter/languages/en.yml
+++ b/themes/starter/languages/en.yml
@@ -147,7 +147,3 @@ translating: translating
optionFive: Design promo materials. Print and distribute
stickers: stickers
thanks: Thank you. See you in # ...network name (context for translation)
-
-# Internal articles
-faq4newbs: FAQ for newcomers
-whyUseFediverse: Why use federated networks
diff --git a/themes/starter/layout/_partial/featured.ejs b/themes/starter/layout/_partial/featured.ejs
index 9155704..3e18263 100644
--- a/themes/starter/layout/_partial/featured.ejs
+++ b/themes/starter/layout/_partial/featured.ejs
@@ -1,14 +1,6 @@
<%
const date = post.date.format(config.date_format).split('-').join('.');
-
- let avatarPath ="";
-
- if (page.avatar) {
- avatarPath = page.avatar;
- } else {
- avatarPath = "default-avatar.png";
- }
%>
@@ -17,7 +9,6 @@
-
